Merge branch 'feature/12月迭代' of http://git.gicdev.com/gicmember/member into dev

src/components/memberlist/memberReturn.js

@@ -26,7 +26,7 @@ export default {
       memberSearchStr: -1,
       navpath: [
         { name: "首页", path: "" },
-        { name: "会员列表", path: "/wechatmembers" },
+        { name: "客户列表", path: "/allCustomers" },
         { name: "待处理客户列表", path: "" }
       ],
       sceneValue: "member",

src/components/memberlist/memberReturn.vue

@@ -48,14 +48,19 @@
                 @change="handleFocusBatch"
                 style="width: 130px"
                 @visible-change="handleVisibleBatch"
+                v-if="$getButtonLimit($buttonCode.memberWxRecycleMainStore)||$getButtonLimit($buttonCode.memberWxRecycleSubStore)" 
                 :disabled="isOperating"
               >
                 <el-option
+                  v-if="$getButtonLimit($buttonCode.memberWxRecycleMainStore)" 
+                  :limit-code="$buttonCode.memberWxRecycleMainStore"
                   key="mainstore"
                   label="修改服务门店"
                   value="mainstore"
                 ></el-option>
                 <el-option
+                  v-if="$getButtonLimit($buttonCode.memberWxRecycleSubStore)" 
+                  :limit-code="$buttonCode.memberWxRecycleSubStore"
                   key="store"
                   label="修改协管门店"
                   value="store"

src/components/memberlist/pos-recycle.js

@@ -27,7 +27,7 @@ export default {
       memberSearchStr: -1,
       navpath: [
         { name: "首页", path: "" },
-        { name: "会员列表", path: "/posmembers" },
+        { name: "客户列表", path: "/allCustomers" },
         { name: "回收站门店会员", path: "" }
       ],
       sceneValue: "member",

src/components/memberlist/pos-recycle.vue

@@ -48,9 +48,12 @@
                 @change="handleFocusBatch"
                 style="width: 130px"
                 @visible-change="handleVisibleBatch"
+                v-if="$getButtonLimit($buttonCode.memberPosRecycleMainStore)" 
                 :disabled="isOperating"
               >
                 <el-option
+                  v-if="$getButtonLimit($buttonCode.memberPosRecycleMainStore)" 
+                  :limit-code="$buttonCode.memberPosRecycleMainStore"
                   key="mainstore"
                   label="修改服务门店"
                   value="mainstore"

src/components/wechatmembers/wmDetail.vue

@@ -31,7 +31,7 @@
               :span-method="(obj)=>spanMethod({...obj,length:group.orderItemList.length})">
               <template v-for="colunm in tableColumnList">
                 <el-table-column :key="colunm" :label="colunm.label" :min-width="colunm.width"
-                  show-overflow-tooltip :prop="colunm.prop">
+                  :show-overflow-tooltip="column.tooltip" :prop="colunm.prop">
                   <template slot-scope="{row}">
                     <template
                       v-if="['orderStatus','deliveryInfo','payAmount'].includes(colunm.prop)">
@@ -45,7 +45,7 @@
                         <div class="delivery-info">
                           <p class="delivery-info-line">收件人：{{ group.buyerName }}</p>
                           <p class="delivery-info-line">手机号：{{ group.buyerPhone }}</p>
-                          <p class="delivery-info-line" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">收货地址：{{ group.addressInfo }}</p>
+                          <p class="delivery-info-line" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;" :title="group.addressInfo">收货地址：{{ group.addressInfo }}</p>
                         </div>
                       </template>
                       <!-- 小计 -->
@@ -161,12 +161,12 @@ export default {
       search: '',
       isWm:true, //当前页面是微盟
       tableColumnList: [
-        { label: '商品', width: '200', prop: 'mallProName' },
-        { label: '单价', width: '80', prop: 'mallProPrice' },
-        { label: '数量', width: '80', prop: 'mallProNumber' },
-        { label: '订单类型', width: '80', prop: 'orderStatus' },
-        { label: '小计（实付）', width: '80', prop: 'payAmount' },
-        { label: '收货信息', width: '200', prop: 'deliveryInfo' },
+        { label: '商品', width: '200', prop: 'mallProName', tooltop:true },
+        { label: '单价', width: '80', prop: 'mallProPrice', tooltop:false },
+        { label: '数量', width: '80', prop: 'mallProNumber', tooltop:false },
+        { label: '订单类型', width: '80', prop: 'orderStatus', tooltop:false },
+        { label: '小计（实付）', width: '80', prop: 'payAmount', tooltop:false },
+        { label: '收货信息', width: '200', prop: 'deliveryInfo', tooltop:false },
       ],
       orderColor:{1:'#303133',2:'#FA8C16',4:'#F5222D'},
     };