Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/components/mixes/talkIm.vue

@@ -15,16 +15,24 @@ export default {
   },
   methods: {
     // 跳转im客服
-    async IMService(id) {
+    async IMService(id, goodsId, skuId) {
 
       // 获取访问Token
       let accessToken = Storage.getItem("accessToken");
       await this.getIMDetailMethods();
       const userInfo = await getMemberMsg();
       if (userInfo.success) {
-        window.open(
-          this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId
-        );
+        //携带商品Id,在IM可以发送商品信息
+        if(goodsId && skuId){
+          window.open(
+            this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId + "&goodsId=" + goodsId + "&skuId=" + skuId
+          );
+        }else{
+          window.open(
+            this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId
+          );
+        }
+
       } else {
         this.$Message.error("请登录后再联系客服");
         return;

buyer/src/pages/GoodsDetail.vue

@@ -22,7 +22,7 @@
             <Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
             {{ storeCollected? "已收藏店铺": "收藏店铺" }}
           </span>
-          <span class="ml_10" @click="IMService(goodsMsg.data.storeId)">联系客服</span>
+          <span class="ml_10" @click="IMService(goodsMsg.data.storeId,goodsMsg.data.goodsId,goodsMsg.data.id)">联系客服</span>
         </div>
       </div>
     </div>

buyer/src/pages/Merchant.vue

@@ -14,7 +14,7 @@
                                                            type="ios-heart"/>{{
             storeCollected ? '已收藏店铺' : '收藏店铺'
           }}</span>
-        <span class="hover-pointer ml_10" style="width:80px" @click="IMService(storeMsg.storeId)"><Icon
+        <span class="hover-pointer ml_10" style="width:80px" @click="IMService(storeMsg.storeId,null,null)"><Icon
           custom="icomoon icon-customer-service"/>联系客服</span>
       </div>
     </div>
@@ -60,7 +60,6 @@
     <div v-else>
       <div class="promotion-decorate">{{ cateName }}</div>
       <div class="goods-list">
-
         <empty v-if="goodsList.length === 0"/>
         <div
           v-for="(item, index) in goodsList"
@@ -69,8 +68,9 @@
           class="goods-show-info"
           @click="goGoodsDetail(item.id, item.goodsId)"
         >
+
           <div class="goods-show-img">
-            <img :src="item.thumbnail" height="220" width="220" alt=""/>
+            <img :src="item.small" height="220" width="220" alt=""/>
           </div>
           <div class="goods-show-price">
             <span>
@@ -254,7 +254,7 @@ export default {
       goodsList(this.params)
         .then((res) => {
           if (res.success) {
-            this.goodsList = res.result;
+            this.goodsList = res.result.records;
             this.total = res.result.total;
           }
         })

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -70,7 +70,8 @@
             <Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay">去支付</Button>
             <Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog">确认收货</Button>
             <!-- 售后 -->
-            <Button v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
+            <Button v-if="order.groupAfterSaleStatus && (order.groupAfterSaleStatus==='NOT_APPLIED'|| order.groupAfterSaleStatus==='PART_AFTER_SALE' )"
+                    @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
           </div>
         </div>
       </div>
@@ -206,7 +207,7 @@ export default {
     applyAfterSale (goodsItem) { // 申请售后
       let arr = []
       goodsItem.forEach(e => {
-        if (e.afterSaleStatus === 'NOT_APPLIED') {
+        if (e.afterSaleStatus === 'NOT_APPLIED'|| e.afterSaleStatus === 'PART_AFTER_SALE') {
           arr.push(e)
         }
       });

manager/src/views/member/list/index.vue

@@ -466,7 +466,6 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
-      debugger
       const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
       let birthday = this.form.birthday=== undefined?'':
@@ -491,7 +490,7 @@ export default {
       API_Member.updateMember(submit).then((res) => {
         if (res.result) {
           this.$Message.success("修改成功！");
-          this.init();
+          this.getData();
         }
       });
     },