update: update

src/components/allCustomers/allCustomersList.vue

@@ -133,7 +133,7 @@
               show-overflow-tooltip
               :min-width="colum==='name'?200:150"
               :fixed="colum==='name'"
-              :sortable="['name','grade','status','channel','createCardStoreName','cardNo','forzenStatus','mainStoreName'].includes(colum)?false:'custom'"
+              :sortable="['name','grade','status','channel','createCardStoreName','cardNo','forzenStatus','mainStoreName'].includes(colum)?false:isExist[colum]?'custom':false"
             >
               <template slot-scope="{row}">
                 <!-- 基本信息 -->

src/components/allCustomers/components/baseinfoDialog.vue

@@ -114,7 +114,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button type="primary" :loading="btnLoading" @click="submit">确定</el-button>
+        <el-button type="primary" :loading="btnLoading" @click="submit" :disabled="isEditPhone">确定</el-button>
       </span>
     </el-dialog>
   </div>

src/components/allCustomers/consumption.vue

@@ -268,7 +268,7 @@ export default {
           path: '/customerDetail?memberId=' + this.$route.query.memberId || '',
         },
         {
-          name: '会员门店消费',
+          name: '门店订单',
           path: '',
         },
       ],

src/components/allCustomers/customerDetail.vue

@@ -202,6 +202,7 @@
               <el-descriptions-item label="商户会员等级:">
                 {{ memberInfo.gradeName||'--' }}
                 <el-popconfirm
+                v-if="memberInfo.erpCalcGrade"
                   popper-class="grade-confirm-wrap"
                   placement="top"
                   width="184"
@@ -222,6 +223,18 @@
                     /></span>
                   </el-tooltip>
                 </el-popconfirm>
+                 <el-tooltip
+                    v-else
+                    class="item"
+                    effect="dark"
+                    open-delay="200"
+                    content="编辑商户会员等级"
+                    placement="top-start"
+                  >
+                    <span class="edit-span" @click="gradeDialogVisible=true"><i
+                      class="el-icon-edit"
+                    /></span>
+                  </el-tooltip>
               </el-descriptions-item>
               <el-descriptions-item label="认证时间:">
                 {{ memberInfo.authTime|formatTime }}

src/components/allCustomers/index.js

@@ -49,6 +49,7 @@ export default {
       memberFields: [], // 列表字段
       checkedFields: [], // 已选列表字段
       memberFieldsName: {}, // 已选列表字段名称
+      isExist:{}, // 该商户表中是否存在列表字段 判断是否支持排序
       multipleList: [],
       dialogIntegralVisible: false,
       dialogGradeVisible: false,
@@ -249,6 +250,7 @@ export default {
                   'lastCostTime',
                   'attentionDate',
                 ];
+            this.isExist = Object.assign({},res.data.result.fields||{})
             // 首先先保存数据 某些品牌的数据返回的很慢
             const resultData = res.data.result.page
               ? res.data.result.page.result

src/components/allCustomers/info.js

@@ -25,7 +25,6 @@ export default {
       ],
       pageName: 'allCustomer', // 请求参数
       memberId: '',
-      // 接口文档 http://yapi.gicdev.com/project/4941/interface/api/153659
       member: {
         // 会员基础信息
         memberProtocolInfo: {
@@ -127,7 +126,7 @@ export default {
             // 交易记录
             transaction: [
               {
-                label: '门店消费',
+                label: '门店订单',
                 icon: 'icon-mendianbaojiadan',
                 key: 'numOfSale',
                 path: '/consumption',

src/components/wechatmembers/integralDataPage.vue

@@ -4,11 +4,18 @@
       <v-nav :navpath="navpath"></v-nav>
       <div class="wrap table-container">
         <div class="mBottom20">
-          <el-row>
-            <el-col :span="12">
+          <div class="search-top">
+            <div class="left-search-wrap">
+                <searchinput
+                    stylelink="width: 280px"
+                    prefix-icon="el-icon-search"
+                    placeholder="请输入会员姓名/昵称/手机"
+                    v-model="searchStr"
+                    @handleSearch="handleSearch"
+                  ></searchinput>
               <el-select
                 v-model="intervalInOut"
-                style="margin-right: 7px;"
+                style="margin:0 6px;"
                 placeholder="所有日志"
                 @change="handleSearch"
               >
@@ -45,30 +52,14 @@
                   :value="item.dictCode"
                 ></el-option>
               </el-select>
-            </el-col>
-            <div :span="12">
-              <div class="displayflex tr">
-                <div class="flex">
-                  <searchinput
-                    stylelink="width: 280px"
-                    prefix-icon="el-icon-search"
-                    placeholder="请输入会员姓名/昵称/手机"
-                    v-model="searchStr"
-                    @handleSearch="handleSearch"
-                  ></searchinput>
-                </div>
-                <div class="ml15">
-                  <el-button
-                    v-if="showHandleScoreBtn"
-                    type="primary"
-                    @click="linkRoute('/modifyintegral')"
-                  >调整积分</el-button>
-                </div>
-              </div>
             </div>
-          </el-row>
+            <el-button
+              v-if="showHandleScoreBtn"
+              type="primary"
+              @click="linkRoute('/modifyintegral')"
+            >调整积分</el-button>
+          </div>
         </div>
-
         <div class="mBottom40">
           <div class="table-content">
             <el-table
@@ -438,4 +429,14 @@ export default {
 .footer-box {
   margin-top: -112px;
 }
+.search-top{
+  display: flex;
+  justify-content:space-between;
+  align-items:center;
+  .left-search-wrap{
+    display: flex;
+    align-items:center;
+    gap:10px;
+  }
+}
 </style>