update: 完成

src/components/allCustomers/customerDetail.vue

@@ -352,8 +352,77 @@
           <!-- 客户记录 -->
           <template v-if="section.name==='customerRecord'">
             <div class="flex-wrap">
-              <!-- 资产信息 -->
+                <!-- 积分明细 -->
               <div class="flex-moudle-item">
+                 <template v-for="item in section.childrenList.point">
+                   <div
+                    :class="['flex-item line-item assets-item','hover', {'other-assets-item': !showClique}]"
+                    v-if="item.iconTheme!=='integral_clique'||(item.iconTheme==='integral_clique'&&showClique)"
+                    :key="item"
+                    @click="goLink(item.path)">
+                    <div class="left">
+                      <p :class="['icon-wrap', item.iconTheme]">
+                        <i :class="['iconfont', item.icon]" />
+                      </p>
+                      <div class="label">
+                        {{ item.iconTheme==='integral'&&!showClique?'积分':item.label }}
+                      </div>
+                      <div class="num">
+                        {{ memberInfo[item.key]?memberInfo[item.key]:0 }}
+                      </div>
+                    </div>
+                    <div class="el-icon-arrow-right"  v-if="item.path" />
+                  </div>
+                  <div class="flex-item" :key="item" v-if="item.iconTheme!=='integral_clique'">
+                  <div class="available-point">
+                    <div class="label">可用积分</div>
+                    <div class="num">{{ memberInfo[item.key]?memberInfo[item.key]:0 }}</div>
+                    <i class="iconfont icon-wodejifen bg-icon"></i>
+                  </div>
+                  <div class="available-point">
+                    <div class="label">
+                      不可用积分 
+                     <el-tooltip  content="不可用原因：积分为冻结/预扣状态，详情可查看客户日志" placement="top">
+                          <i class="iconfont icon-QuestionCircleOutlined" style="color: #909399" />
+                      </el-tooltip>
+                      </div>
+                    <div class="num">0</div>
+                    <i class="iconfont icon-wodejifen bg-icon"></i>
+                  </div>
+                  </div>
+                 </template>
+              </div>
+              <!-- 资产信息 -->
+                <ul class="flex-column-wrap">
+                <li
+                  v-for="item in section.childrenList.assets"
+                  :class="['flex-column-item flex-item  assets-item',item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'']"
+                  :key="item"
+                  @click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)"
+                >
+                  <div class="left">
+                    <p :class="['icon-wrap market', item.iconTheme]">
+                      <i :class="['iconfont', item.icon]" />
+                    </p>
+                    <div class="middle">
+                      <div class="label">
+                        {{ item.label }}
+                       <el-tooltip v-if="item.key == 'numOfMarket'" content="只统计近半年的数据" placement="top">
+                          <i class="iconfont icon-QuestionCircleOutlined" style="color: #909399" />
+                       </el-tooltip>
+                      </div>
+                      <div class="num">
+                        {{ memberInfo[item.key]
+                          ?(item.key==='storedValue'?(memberInfo[item.key]|storedValue):(memberInfo[item.key]))
+                          :0 }}
+                      </div>
+                    </div>
+                  </div>
+                   <div class="el-icon-arrow-right"
+                      v-if="item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)" />
+                </li>
+              </ul>
+              <!-- <div class="flex-moudle-item">
                 <template v-for="item in section.childrenList.assets">
                   <div
                     :class="['flex-item line-item assets-item',item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'', {'other-assets-item': !showClique}]"
@@ -377,7 +446,7 @@
                       v-if="item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)" />
                   </div>
                 </template>
-              </div>
+              </div> -->
               <!-- 交易记录 -->
               <div class="flex-moudle-item">
                 <div class="flex-item line-item hover transaction-item" @click="goLink(item.path)"

src/components/allCustomers/info.js

@@ -108,8 +108,8 @@ export default {
           name: 'customerRecord',
           class: 'customer-record-contain max1600',
           childrenList: {
-            // 资产信息
-            assets: [
+          //积分
+            point:[
               {
                 label: '集团积分',
                 icon: 'icon-jifenjiabei',
@@ -124,6 +124,10 @@ export default {
                 key: 'accumulatPoints',
                 path: '/integralDataPage',
               },
+            ],
+              // 资产信息
+            assets: [
+            
               {
                 label: '卡券',
                 icon: 'icon-01_kaquanguanli',

src/components/wechatmembers/integralDataPage.vue

@@ -44,6 +44,10 @@
           <el-option label="所有来源渠道" :value=-1></el-option>
           <el-option v-for="item in sourceTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
+        <el-select v-model="frozenStatus" placeholder="所有积分状态" @change="handleSearch">
+          <el-option label="所有积分状态" :value=-1></el-option>
+          <el-option v-for="item in frozenStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
       </div>
       <el-button
         v-if="getCodeAuth('memberAdjustIntegral')"
@@ -87,6 +91,15 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="frozenStatus"
+          label="积分状态"
+          min-width="80px"
+        >
+         <template slot-scope="{row}">
+            <span>{{  row.frozenStatus==1?'冻结':'可用' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
           prop="memberIntegralName"
           label="事由"
           min-width="80px"
@@ -237,11 +250,16 @@ export default {
         { label: '批处理导入', value: 4 },
         { label: '天猫会员通', value: 5 }
       ],
+      frozenStatusList:[
+        {label:'冻结积分',value:1},
+        {label:'可用积分',value:0}
+      ],
       memberData: [],
       intervalInOut: -1,
       dictCode: -1,
       searchType: 1,
       sourceType: -1,
+      frozenStatus:-1,
       beginTime: "",
       endTime: "",
       storeName: "",
@@ -305,7 +323,8 @@ export default {
         sourceType: this.sourceType,
         beginTime: this.beginTime,
         endTime: this.endTime,
-        storeName: this.storeName
+        storeName: this.storeName,
+        frozenStatus:this.frozenStatus
       })
         .then(res => {
           if (res.data.errorCode === 0) {