解决冲突

pageA/payorder.vue

@@ -371,9 +371,56 @@ export default {
               title: this.i18n.Paymentsuccess,
               icon: "none",
             });
-            uni.navigateBack({
-              delta: 1,
+            //一秒钟之后返回上一页
+            let timer = setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+              clearTimeout(timer);
+            }, 1000);
+          });
+        return;
+      } else if (this.orderType == "bond") {
+        //支付保证金
+        uni.$u.http
+          .post(`/api/order/earnest_pay`, {
+            order_id: this.orderid,
+          })
+          .then((res) => {
+            if (this.pay_type == "wechat") {
+              uni.requestPayment({
+                provider: "wxpay",
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.package,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (res) {
+                  this.$u.toast("支付成功");
+                  console.log("success:" + JSON.stringify(res));
+                  setTimeout(() => {
+                    uni.navigateTo({
+                      url: "confirm",
+                    });
+                  }, 800);
+                },
+                fail: function (err) {
+                  console.log("fail:" + JSON.stringify(err));
+                },
+              });
+            }
+            //提示支付成功
+            uni.showToast({
+              title: "支付成功",
+              icon: "none",
             });
+            //一秒钟之后返回上一页
+            let timer = setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+              clearTimeout(timer);
+            }, 1000);
           });
         return;
       }
@@ -398,9 +445,9 @@ export default {
                   this.$u.toast(this.i18n.Paymentsuccess);
                   console.log("success:" + JSON.stringify(res));
                   setTimeout(() => {
-              			uni.navigateTo({
-										url: "/pageA/confirm",
-									});
+                    uni.navigateTo({
+                      url: "/pageA/confirm",
+                    });
                   }, 800);
                 },
                 fail: function (err) {
@@ -415,14 +462,14 @@ export default {
                 // 	console.log(error);
                 // },
               });
-            }else{
-								this.$u.toast(this.i18n.Paymentsuccess)
-								setTimeout(() => {
-									uni.navigateTo({
-										url: "/pageA/confirm",
-									});
-								}, 800);
-							}
+            } else {
+              this.$u.toast(this.i18n.Paymentsuccess);
+              setTimeout(() => {
+                uni.navigateTo({
+                  url: "/pageA/confirm",
+                });
+              }, 800);
+            }
 
             uni.showToast({
               title: this.i18n.Paymentsuccess,

pageC/orderForm/component/orderInofrmation.vue

@@ -95,6 +95,7 @@
       </button>
       <button
         class="status-1"
+        @click.stop="$emit('toLogistics', itemInfo)"
         v-if="
           itemInfo.order.status == 'delivered' ||
           itemInfo.order.status == 'finished'

pageC/orderForm/orderForm.vue

@@ -52,6 +52,13 @@
           待发货
         </view>
         <view
+          :class="{ commodity: follow == 'undifference' }"
+          class="tab"
+          @click="tabSwitch('undifference')"
+        >
+          待补差价
+        </view>
+        <view
           :class="{ commodity: follow == 'delivered' }"
           class="tab"
           @click="tabSwitch('delivered')"
@@ -90,6 +97,7 @@
             @toPay="toPay"
             @toEvaluate="toEvaluate"
             @unreviewAfter="unreviewAfter"
+            @toLogistics="toLogistics"
           />
         </view>
         <view v-else>
@@ -160,6 +168,13 @@ export default {
       });
     },
 
+    //查看物流进度
+    toLogistics(value) {
+      uni.navigateTo({
+        url: "/pageD/logisticsProgress/logisticsProgress",
+      });
+    },
+
     //跳转评价
     toEvaluate(value) {
       uni.navigateTo({

pageC/orderFormDetail/orderFormDetail.vue

@@ -196,6 +196,7 @@
       <button
         class="status-1"
         v-if="orderDetail.simplify_status == 'delivered'"
+        @click="toLogistics"
       >
         查看物流
       </button>
@@ -212,7 +213,11 @@
         @click="more"
         >更多</view
       >
-      <button class="status-1" v-if="orderDetail.simplify_status == 'finished'">
+      <button
+        class="status-1"
+        v-if="orderDetail.simplify_status == 'finished'"
+        @click="toLogistics"
+      >
         查看物流
       </button>
       <button class="status-1" v-if="orderDetail.simplify_status == 'finished'">
@@ -298,7 +303,14 @@ export default {
     //跳转支付
     toUnPay() {
       uni.navigateTo({
-        url: `/pageA/payorder?sum=${this.orderDetail.amount}&orderid=${this.orderDetail.id}&orderType=difference`,
+        url: `/pageA/payorder?sum=${this.orderDetail.amount}&orderid=${this.orderDetail.id}`,
+      });
+    },
+
+    //查看物流进度
+    toLogistics(value) {
+      uni.navigateTo({
+        url: "/pageD/logisticsProgress/logisticsProgress",
       });
     },
 

pageD/commodityManage/component/goodsInformation.vue

@@ -15,7 +15,7 @@
           >
             自营
           </view>
-          <view class="_label" v-if="itemInfo.goods.source == 0"> 团长 </view>
+          <!-- <view class="_label" v-if="itemInfo.goods.source == 0"> 团长 </view> -->
           <view class="title" v-if="productAndCommodity == 'product'">
             {{ itemInfo.name_cn }}
           </view>

pageD/evaluate/evaluate.vue

@@ -3,7 +3,7 @@
     <view class="content" v-for="item in orderDetail.goods">
       <view class="goods-title">
         <image class="goods-img" :src="item.goods_image" mode="scaleToFill" />
-        <view class="title"> 立白大师香氛洗衣液持久留香香水机洗护理洗… </view>
+        <view class="title"> {{ item.goods_name }} </view>
       </view>
       <view class="rate">
         <view class="_label"> 商品评价 </view>
@@ -69,7 +69,16 @@ export default {
           video: "",
         })
         .then((res) => {
-          console.log(res);
+          uni.showToast({
+            title: "评价成功",
+            icon: "none",
+          });
+          let timer = setTimeout(() => {
+            uni.navigateBack({
+              delta: 1,
+            });
+            clearTimeout(timer);
+          }, 1000);
         });
     },
     // 删除图片
@@ -85,8 +94,8 @@ export default {
       lists.map((item) => {
         this[`fileList${event.name}`].push({
           ...item,
-          status: "uploading",
-          message: "上传中",
+          // status: "uploading",
+          // message: "上传中",
         });
       });
       for (let i = 0; i < lists.length; i++) {

pageD/homepage/homepage.vue

@@ -10,9 +10,20 @@
           <button class="btn-1">
             <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
           </button>
-          <button v-if="isShow != '1'" class="btn-1">
+          <button
+            v-if="isShow != '1' && userInfo.is_interest == 1"
+            class="btn-1"
+            @click="followTeam(0)"
+          >
             <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
           </button>
+          <button
+            class="btn-1"
+            v-if="userInfo.is_interest == 0"
+            @click="followTeam(1)"
+          >
+            已关注
+          </button>
         </view>
         <view class="name"> {{ userInfo.merchant_name }} </view>
 
@@ -149,6 +160,21 @@ export default {
       });
     },
 
+    //关注 or 取消关注 店铺
+    followTeam(num) {
+      uni.$u.http
+        .post(`/api/interest/follow`, {
+          interest_type: 1,
+          interest_id: this.userInfo.id,
+        })
+        .then((res) => {
+          this.userInfo.is_interest = num;
+          uni.showToast({
+            title: !num ? "关注成功" : "取消关注",
+            icon: "none",
+          });
+        });
+    },
     getCommodityList(status = "") {
       //获取用户信息
       uni.$u.http

pageD/orderDetail/orderDetail.vue

@@ -201,8 +201,14 @@ export default {
 
     //跳转支付
     toPay() {
+      //所有需要缴纳保证金的金额相加
+      let goodsMoney = 0;
+      this.orderDetail.order_goods.map((item) => {
+        item;
+        goodsMoney += Number(item.earnest_money);
+      });
       uni.navigateTo({
-        url: `/pageA/payorder?num=${this.orderDetail.earnest_money}&orderid=${this.orderDetail.id}`,
+        url: `/pageA/payorder?num=${goodsMoney}&orderid=${this.orderDetail.id}`,
       });
     },
 

pageD/orderFormManage/component/detailCard.vue

@@ -14,7 +14,7 @@
       v-for="item in itemInfo.order_goods"
     >
       <view class="detail">
-        <image class="order-img" :src="item.goods_image" mode=""></image>
+        <image class="order-img" :src="item.sku_item.image" mode=""></image>
         <view class="detail-right">
           <view class="title-price">
             <view class="title"> {{ item.goods_name }}</view>
@@ -63,7 +63,11 @@
         itemInfo.simplify_status != 'undelivered'
       "
     >
-      <button class="btn-1" v-if="itemInfo.simplify_status == 'unfill'">
+      <button
+        class="btn-1"
+        v-if="itemInfo.simplify_status == 'unfill'"
+        @click.stop="toBond"
+      >
         缴纳保证金
       </button>
       <button class="btn-2" v-if="itemInfo.simplify_status == 'merdelivered'">
@@ -120,6 +124,18 @@ export default {
     return {};
   },
   methods: {
+    toBond() {
+      //所有需要缴纳保证金的金额相加
+      let goodsMoney = 0;
+      this.itemInfo.order_goods.map((item) => {
+        item;
+        goodsMoney += Number(item.earnest_money);
+      });
+      //跳转支付
+      uni.navigateTo({
+        url: `/pageA/payorder?num=${goodsMoney}&orderid=${this.itemInfo.id}&orderType=bond`,
+      });
+    },
     toGoods() {
       uni.navigateTo({
         url: `/pageD/deliverGoods/deliverGoods?id=${this.itemInfo.id}`,

pages/cart/cart.vue

@@ -240,7 +240,7 @@ export default {
       all: [], //全选数组
       goodsList: [],
       selectall: -1,
-      goodsNum: 0,
+      goodsNum: 0, //购物车商品数量
       num: false,
       goodsWeight: 0, //商品重量
       goodsPrice: 0, //商品价格
@@ -533,6 +533,7 @@ export default {
     },
     //获取购物车数据
     getShopCarList() {
+      this.goodsNum = 0;
       uni.$u.http.get(`/api/cart`).then((res) => {
         this.goodsList = res.data;
         //循环店铺，获取购物车商品数量

unpackage/dist/dev/mp-weixin/pageA/payorder.js

@@ -509,9 +509,54 @@ var _default = {
             title: _this5.i18n.Paymentsuccess,
             icon: "none"
           });
-          uni.navigateBack({
-            delta: 1
+          //一秒钟之后返回上一页
+          var timer = setTimeout(function () {
+            uni.navigateBack({
+              delta: 1
+            });
+            clearTimeout(timer);
+          }, 1000);
+        });
+        return;
+      } else if (this.orderType == "bond") {
+        //支付保证金
+        uni.$u.http.post("/api/order/earnest_pay", {
+          order_id: this.orderid
+        }).then(function (res) {
+          if (_this5.pay_type == "wechat") {
+            uni.requestPayment({
+              provider: "wxpay",
+              timeStamp: String(res.timeStamp),
+              nonceStr: res.nonceStr,
+              package: res.package,
+              signType: res.signType,
+              paySign: res.paySign,
+              success: function success(res) {
+                this.$u.toast("支付成功");
+                console.log("success:" + JSON.stringify(res));
+                setTimeout(function () {
+                  uni.navigateTo({
+                    url: "confirm"
+                  });
+                }, 800);
+              },
+              fail: function fail(err) {
+                console.log("fail:" + JSON.stringify(err));
+              }
+            });
+          }
+          //提示支付成功
+          uni.showToast({
+            title: "支付成功",
+            icon: "none"
           });
+          //一秒钟之后返回上一页
+          var timer = setTimeout(function () {
+            uni.navigateBack({
+              delta: 1
+            });
+            clearTimeout(timer);
+          }, 1000);
         });
         return;
       }

unpackage/dist/dev/mp-weixin/pageC/orderForm/orderForm.js

@@ -232,6 +232,12 @@ var _default = {
         url: "/pageC/orderFormDetail/orderFormDetail?orderId=".concat(value.order.id)
       });
     },
+    //查看物流进度
+    toLogistics: function toLogistics(value) {
+      uni.navigateTo({
+        url: "/pageD/logisticsProgress/logisticsProgress"
+      });
+    },
     //跳转评价
     toEvaluate: function toEvaluate(value) {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pageC/orderFormDetail/orderFormDetail.js

@@ -246,7 +246,13 @@ var _default = {
     //跳转支付
     toUnPay: function toUnPay() {
       uni.navigateTo({
-        url: "/pageA/payorder?sum=".concat(this.orderDetail.amount, "&orderid=").concat(this.orderDetail.id, "&orderType=difference")
+        url: "/pageA/payorder?sum=".concat(this.orderDetail.amount, "&orderid=").concat(this.orderDetail.id)
+      });
+    },
+    //查看物流进度
+    toLogistics: function toLogistics(value) {
+      uni.navigateTo({
+        url: "/pageD/logisticsProgress/logisticsProgress"
       });
     },
     close: function close(value) {

unpackage/dist/dev/mp-weixin/pageD/evaluate/evaluate.js

@@ -247,7 +247,16 @@ var _default = {
         image: imgList.join(","),
         video: ""
       }).then(function (res) {
-        console.log(res);
+        uni.showToast({
+          title: "评价成功",
+          icon: "none"
+        });
+        var timer = setTimeout(function () {
+          uni.navigateBack({
+            delta: 1
+          });
+          clearTimeout(timer);
+        }, 1000);
       });
     },
     // 删除图片
@@ -268,10 +277,7 @@ var _default = {
                 lists = [].concat(event.file);
                 fileListLen = _this["fileList".concat(event.name)].length;
                 lists.map(function (item) {
-                  _this["fileList".concat(event.name)].push(_objectSpread(_objectSpread({}, item), {}, {
-                    status: "uploading",
-                    message: "上传中"
-                  }));
+                  _this["fileList".concat(event.name)].push(_objectSpread({}, item));
                 });
                 i = 0;
               case 5:

unpackage/dist/dev/mp-weixin/pageD/evaluate/evaluate.wxml

@@ -1 +1 @@
-<view class="data-v-fa248092"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-fa248092"><view class="goods-title data-v-fa248092"><image class="goods-img data-v-fa248092" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-fa248092">立白大师香氛洗衣液持久留香香水机洗护理洗…</view></view><view class="rate data-v-fa248092"><view class="_label data-v-fa248092">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-fa248092" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-fa248092"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-fa248092" bind:__l="__l"></u-icon><text class="data-v-fa248092">添加图片/视频</text></view></u-upload><view class="_text data-v-fa248092"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-fa248092" bindtap="__e">提交评价</button></view>
+<view class="data-v-fa248092"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-fa248092"><view class="goods-title data-v-fa248092"><image class="goods-img data-v-fa248092" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-fa248092">{{''+item.goods_name+''}}</view></view><view class="rate data-v-fa248092"><view class="_label data-v-fa248092">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-fa248092" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-fa248092"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-fa248092" bind:__l="__l"></u-icon><text class="data-v-fa248092">添加图片/视频</text></view></u-upload><view class="_text data-v-fa248092"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-fa248092" bindtap="__e">提交评价</button></view>

unpackage/dist/dev/mp-weixin/pageD/homepage/homepage.js

@@ -225,12 +225,26 @@ var _default = {
         url: "/pageA/productdetails?id=".concat(item.id)
       });
     },
-    getCommodityList: function getCommodityList() {
+    //关注 or 取消关注 店铺
+    followTeam: function followTeam(num) {
       var _this = this;
+      uni.$u.http.post("/api/interest/follow", {
+        interest_type: 1,
+        interest_id: this.userInfo.id
+      }).then(function (res) {
+        _this.userInfo.is_interest = num;
+        uni.showToast({
+          title: !num ? "关注成功" : "取消关注",
+          icon: "none"
+        });
+      });
+    },
+    getCommodityList: function getCommodityList() {
+      var _this2 = this;
       var status = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       //获取用户信息
       uni.$u.http.get("/api/merchant/info?merchant_id=".concat(this.userId)).then(function (res) {
-        _this.userInfo = res;
+        _this2.userInfo = res;
       });
 
       //获取店铺商品
@@ -242,7 +256,7 @@ var _default = {
         keywords: this.keywords,
         source: this.source
       }).then(function (res) {
-        _this.goodsList = res.data;
+        _this2.goodsList = res.data;
       });
     }
   },

unpackage/dist/dev/mp-weixin/pageD/orderDetail/orderDetail.js

@@ -244,8 +244,14 @@ var _default = {
     },
     //跳转支付
     toPay: function toPay() {
+      //所有需要缴纳保证金的金额相加
+      var goodsMoney = 0;
+      this.orderDetail.order_goods.map(function (item) {
+        item;
+        goodsMoney += Number(item.earnest_money);
+      });
       uni.navigateTo({
-        url: "/pageA/payorder?num=".concat(this.orderDetail.earnest_money, "&orderid=").concat(this.orderDetail.id)
+        url: "/pageA/payorder?num=".concat(goodsMoney, "&orderid=").concat(this.orderDetail.id)
       });
     },
     //跳转支付

unpackage/dist/dev/mp-weixin/pageD/orderFormManage/component/detailCard.js

@@ -229,6 +229,10 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   props: {
     itemInfo: {
@@ -265,6 +269,18 @@ var _default = {
     return {};
   },
   methods: {
+    toBond: function toBond() {
+      //所有需要缴纳保证金的金额相加
+      var goodsMoney = 0;
+      this.itemInfo.order_goods.map(function (item) {
+        item;
+        goodsMoney += Number(item.earnest_money);
+      });
+      //跳转支付
+      uni.navigateTo({
+        url: "/pageA/payorder?num=".concat(goodsMoney, "&orderid=").concat(this.itemInfo.id, "&orderType=bond")
+      });
+    },
     toGoods: function toGoods() {
       uni.navigateTo({
         url: "/pageD/deliverGoods/deliverGoods?id=".concat(this.itemInfo.id)

unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -478,6 +478,7 @@ var _default = {
       goodsList: [],
       selectall: -1,
       goodsNum: 0,
+      //购物车商品数量
       num: false,
       goodsWeight: 0,
       //商品重量
@@ -738,6 +739,7 @@ var _default = {
     //获取购物车数据
     getShopCarList: function getShopCarList() {
       var _this7 = this;
+      this.goodsNum = 0;
       uni.$u.http.get("/api/cart").then(function (res) {
         _this7.goodsList = res.data;
         //循环店铺，获取购物车商品数量

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,15 +9,10 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.3",
+  "libVersion": "",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
   "condition": {
@@ -38,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }