update

pages.json

@@ -175,6 +175,11 @@
 				"style": {
 					"navigationBarTitleText": "添加评价"
 				}
+			}, {
+				"path": "selectEvaluate",
+				"style": {
+					"navigationBarTitleText": "选择评价商品"
+				}
 			}]
 		},
 		{

pages/evaluateList/addEvaluate.vue

@@ -44,7 +44,7 @@
         <textarea
           cols="30"
           rows="5"
-          :disabled="detailObj.COMMENT_STATE !== 1"
+          :disabled="detailObj.COMMENT_STATE === 1"
           :placeholder="
             saveMsg.merchantsId
               ? '说说这家店的口味、环境、服务'
@@ -94,7 +94,10 @@ export default {
       sellchildid: "",
       orderInternal: "",
       currentShopName: "",
+      evaluateType: "", // 评价的页面类型
+      shopId: "", // 评价的商品id
       detailObj: {}, // 用户详情
+      thisShopDetail: {}, // 当前商品详情
     };
   },
   computed: {
@@ -215,6 +218,10 @@ export default {
       });
     },
     deleteImg(index) {
+      if (this.detailObj.COMMENT_STATE === 1) {
+        return;
+      }
+
       console.log("index", index);
       let _this = this;
       _this.$api
@@ -258,18 +265,15 @@ export default {
           title: "正在提交...",
           mask: true,
         });
-        let allTrue = true;
-        for (let i = 0; i < list.length; i++) {
-          let obj = list[0];
         let req = {
           action_type: "addMallComment",
-            merchantsId: obj.MERCHANTS_ID,
+          merchantsId: this.thisShopDetail.MERCHANTS_ID,
-            merchantsName: obj.MERCHANTS_NAME,
+          merchantsName: this.thisShopDetail.MERCHANTS_NAME,
-            saleBillId: obj.SALEBILL_ID,
+          saleBillId: this.thisShopDetail.SALEBILL_ID,
-            salebillChildId: obj.SALEBILL_CHILD_ID,
+          salebillChildId: this.thisShopDetail.SALEBILL_CHILD_ID,
           // salebillChildCode: "",
           // supplierId: obj.SUPPLIER_ID,
-            commodityId: obj.COMMODITY_ID,
+          commodityId: this.thisShopDetail.COMMODITY_ID,
           isAnonymous: this.saveMsg.isAnonymous,
           commentContent: this.saveMsg.commentContent,
           commentScore: this.saveMsg.commentScore,
@@ -279,12 +283,6 @@ export default {
         let data = await this.$api.postCoop(req);
         console.log("data", data);
         if (data.ResultCode == "100") {
-          } else {
-            allTrue = false;
-          }
-        }
-        uni.hideLoading();
-        if (allTrue) {
           uni.showToast({
             title: "评价成功！",
           });
@@ -293,7 +291,12 @@ export default {
               delta: 1,
             });
           }, 1000);
+        } else {
+          uni.showToast({
+            title: data.ResultDesc,
+          });
         }
+        uni.hideLoading();
       }
     },
     postIt() {
@@ -398,6 +401,25 @@ export default {
             let _data = res.Data;
             console.log("订单详情", _data);
             _this.detailObj = _data;
+            console.log("_this.evaluateType", _this.evaluateType);
+            console.log("Number(_this.shopId)", Number(_this.shopId));
+            if (_this.evaluateType === "more") {
+              let list = _data.List;
+              let obj = {};
+              if (list && list.length > 0) {
+                list.forEach((item) => {
+                  if (item.COMMODITY_ID === Number(_this.shopId)) {
+                    obj = item;
+                  }
+                });
+              }
+              _this.thisShopDetail = obj;
+              _this.currentShopName = obj.COMMODITY_NAME;
+              _this.storeMsg.MERCHANTS_LOGO = obj.IMAGE_PATH;
+              if (obj.COMMENT_STATE === 1) {
+                _this.handleGetEvaluateDetail();
+              }
+            } else {
               if (_data.COMMENT_STATE === 1) {
                 _this.handleGetEvaluateDetail();
               }
@@ -405,6 +427,7 @@ export default {
               let list = _data.List;
               let shopTitle = "";
               if (list && list.length > 0) {
+                _this.thisShopDetail = list[0];
                 shopTitle = list[0].COMMODITY_NAME;
                 if (list.length > 1) {
                   shopTitle += `等${list.length}件商品`;
@@ -413,6 +436,7 @@ export default {
               _this.currentShopName = shopTitle;
               _this.storeMsg.MERCHANTS_LOGO = list[0].IMAGE_PATH;
             }
+          }
         });
     },
     // 评价详情
@@ -421,9 +445,24 @@ export default {
         action_type: "getMallCommentList",
         salebillId: this.orderInternal,
         salebillChildId: this.sellchildid || "",
+        commodityId: this.detailObj.List[0].COMMODITY_ID,
       };
       const data = await this.$api.getCoop(req);
       console.log("data", data);
+      this.thisShopDetail = data.Data.List[0];
+
+      this.saveMsg.commentContent = this.thisShopDetail.MALLCOMMENT_CONTENT;
+      this.saveMsg.imageArr = this.thisShopDetail.IMAGELIST;
+      let imgList = [];
+      if (
+        this.thisShopDetail.IMAGELIST &&
+        this.thisShopDetail.IMAGELIST.length > 0
+      ) {
+        this.thisShopDetail.IMAGELIST.forEach((item) => {
+          imgList.push(item.IMAGE_URL);
+        });
+      }
+      this.imgsList = imgList;
     },
   },
   onUnload() {
@@ -444,6 +483,13 @@ export default {
     if (option.sellchildid) {
       this.sellchildid = option.sellchildid;
     }
+    if (option.evaluateType) {
+      this.evaluateType = option.evaluateType;
+    }
+    if (option.id) {
+      this.shopId = option.id;
+    }
+
     this.orderInternal = option.orderInternal;
 
     // 获取订单详情

pages/evaluateList/index.vue

@@ -144,6 +144,19 @@ export default {
     },
     goEvaluate(obj) {
       console.log("obj", obj);
+      if (obj.IMAGELIST && obj.IMAGELIST.length >= 2) {
+        uni.navigateTo({
+          url:
+            "/pages/evaluateList/selectEvaluate?sellchildid=" +
+            obj.SALEBILL_CHILD_ID +
+            "&orderInternal=" +
+            obj.SALEBILL_ID +
+            "&orderStatus=" +
+            obj.SALEBILL_STATE +
+            "&SUPPLIER_NAME=" +
+            obj.SUPPLIER_NAME,
+        });
+      } else {
         uni.navigateTo({
           url:
             "/pages/evaluateList/addEvaluate?sellchildid=" +
@@ -158,6 +171,7 @@ export default {
         // uni.navigateTo({
         //   url: `/pages/evaluateList/addEvaluate?SALEBILL_ID=${obj.SALEBILL_ID}&SALEBILL_CHILD_ID=${obj.SALEBILL_CHILD_ID}`,
         // });
+      }
     },
   },
   onReachBottom() {},

pages/evaluateList/selectEvaluate.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="main">
+    <div class="shopList">
+      <div
+        class="shopItem"
+        v-for="(item, index) in detailObj.List"
+        :key="index"
+        @click="handleGoEvaluate(item)"
+      >
+        <div class="leftShopItem">
+          <image class="img" :src="item.IMAGE_PATH" />
+        </div>
+        <div class="rightShopItem">
+          <view class="shopName">{{ item.COMMODITY_NAME || "-" }}</view>
+          <view class="status">{{
+            item.COMMENT_STATE === 0
+              ? "待评价"
+              : item.COMMENT_STATE === 1
+              ? "已评价"
+              : ""
+          }}</view>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      sellchildid: "",
+      orderInternal: "",
+      detailObj: {},
+    };
+  },
+  onLoad(option) {
+    console.log("option", option);
+    if (option.sellchildid) {
+      this.sellchildid = option.sellchildid;
+    }
+    this.orderInternal = option.orderInternal;
+  },
+  onShow() {
+    // 获取订单详情
+    this.handleGetOrderInfo();
+  },
+  methods: {
+    handleGetOrderInfo() {
+      let _this = this;
+      _this.$api
+        .getCoop({
+          action_type: "GetOrderDetail",
+          salebillId: _this.orderInternal,
+          saleBillChildId: _this.sellchildid,
+        })
+        .then((res) => {
+          // console.log(res)
+          if (res.ResultCode === "100") {
+            let _data = res.Data;
+            console.log("订单详情", _data);
+            _this.detailObj = _data;
+          }
+        });
+    },
+    // 跳转去单个的评价
+    handleGoEvaluate(obj) {
+      uni.navigateTo({
+        url: `/pages/evaluateList/addEvaluate?evaluateType=more&id=${obj.COMMODITY_ID}&sellchildid=${this.sellchildid}&orderInternal=${this.orderInternal}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  width: 100vw;
+  height: 100vh;
+  overflow-y: scroll;
+  box-sizing: border-box;
+  padding: 24rpx;
+  .shopList {
+    width: 100%;
+    height: 100%;
+    .shopItem {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 16rpx;
+      background: #fff;
+      border-radius: 16rpx;
+      margin-bottom: 16rpx;
+      display: flex;
+      align-items: flex-start;
+      .leftShopItem {
+        width: 104rpx;
+        height: 104rpx;
+        border-radius: 16rpx;
+        overflow: hidden;
+        margin-right: 16rpx;
+        .img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .rightShopItem {
+        width: calc(100% - 120rpx);
+        height: 100%;
+        .shopName {
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #130f05;
+          line-height: 44rpx;
+          text-align: left;
+          font-style: normal;
+          width: 100%;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+        .status {
+          font-size: 28rpx;
+          font-family: "PingFang SC";
+          line-height: 40rpx;
+          color: #1890ff;
+        }
+      }
+    }
+  }
+}
+.main::-webkit-scrollbar {
+  display: none;
+}
+</style>

pages/highwayHeadlines/detail.vue

@@ -6,7 +6,11 @@
       class="navList"
       v-if="detailObj.ImageList && detailObj.ImageList.length > 0"
     >
-      <image class="img" :src="detailObj.ImageList[0].ImageUrl" />
+      <image
+        class="img"
+        :src="detailObj.ImageList[0].ImageUrl"
+        @click="handleShowPreview(detailObj.ImageList[0].ImageUrl)"
+      />
     </div>
     <text class="content">{{ detailObj.NOTICEINFO_CONTENT || "" }}</text>
   </div>
@@ -29,6 +33,13 @@ export default {
     }
   },
   methods: {
+    // 预览查看
+    handleShowPreview(url) {
+      uni.previewImage({
+        current: url, // 当前显示图片的http链接
+        urls: [url], // 需要预览的图片http链接列表
+      });
+    },
     async hanldeGetDetail(id) {
       const req = {
         NOTICEINFOId: id,

pages/order/orderFoodDetail/index.vue

@@ -691,12 +691,15 @@ export default {
       _this.orderAmount = total;
     },
     goEvaluate() {
+      console.log("this.orderInfo", this.orderInfo);
       uni.navigateTo({
         url:
-          "/pages/newEvaluate/main?merchantsId=" +
+          "/pages/evaluateList/addEvaluate?merchantsId=" +
           this.orderInfo.MERCHANTS_ID +
-          "&saleBillId=" +
+          "&orderInternal=" +
-          this.orderInfo.SALEBILL_ID,
+          this.orderInfo.SALEBILL_ID +
+          "&sellchildid=" +
+          (this.orderInfo.SALEBILL_CHILD_ID || ""),
       });
     },
     goShop() {

pages/user/index.vue

@@ -304,6 +304,8 @@ export default {
     }
     // 拿车牌号
     this.handleGetCarCode();
+    // 拿用户信息
+    this.handleGetUserDetail();
   },
   computed: {
     ...mapGetters({
@@ -320,6 +322,15 @@ export default {
     },
   },
   methods: {
+    // 拿到用户详情
+    async handleGetUserDetail() {
+      const userData = await this.$api.getCoop({
+        action_type: "GetMembershipInfo",
+        WechatUserId: this.user.WechatUserId,
+      });
+      this.userInfo = userData.Data;
+      console.log("this.userInfo", this.userInfo);
+    },
     // 跳转去售后 即已完成的列表
     handleGo(url) {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/app.json

@@ -82,7 +82,8 @@
       "root": "pages/evaluateList",
       "pages": [
         "index",
-        "addEvaluate"
+        "addEvaluate",
+        "selectEvaluate"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/pages/evaluateList/addEvaluate.js

@@ -190,7 +190,13 @@ var _default = {
       sellchildid: "",
       orderInternal: "",
       currentShopName: "",
-      detailObj: {} // 用户详情
+      evaluateType: "",
+      // 评价的页面类型
+      shopId: "",
+      // 评价的商品id
+      detailObj: {},
+      // 用户详情
+      thisShopDetail: {} // 当前商品详情
     };
   },
 
@@ -318,6 +324,9 @@ var _default = {
       });
     },
     deleteImg: function deleteImg(index) {
+      if (this.detailObj.COMMENT_STATE === 1) {
+        return;
+      }
       console.log("index", index);
       var _this = this;
       _this.$api.postCoop({
@@ -355,58 +364,41 @@ var _default = {
     handlePostShop: function handlePostShop() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var list, allTrue, i, obj, req, data;
+        var list, req, data;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 list = _this2.detailObj.List;
                 if (!(list && list.length > 0)) {
-                  _context.next = 18;
+                  _context.next = 10;
                   break;
                 }
                 uni.showLoading({
                   title: "正在提交...",
                   mask: true
                 });
-                allTrue = true;
-                i = 0;
-              case 5:
-                if (!(i < list.length)) {
-                  _context.next = 16;
-                  break;
-                }
-                obj = list[0];
                 req = {
                   action_type: "addMallComment",
-                  merchantsId: obj.MERCHANTS_ID,
+                  merchantsId: _this2.thisShopDetail.MERCHANTS_ID,
-                  merchantsName: obj.MERCHANTS_NAME,
+                  merchantsName: _this2.thisShopDetail.MERCHANTS_NAME,
-                  saleBillId: obj.SALEBILL_ID,
+                  saleBillId: _this2.thisShopDetail.SALEBILL_ID,
-                  salebillChildId: obj.SALEBILL_CHILD_ID,
+                  salebillChildId: _this2.thisShopDetail.SALEBILL_CHILD_ID,
                   // salebillChildCode: "",
                   // supplierId: obj.SUPPLIER_ID,
-                  commodityId: obj.COMMODITY_ID,
+                  commodityId: _this2.thisShopDetail.COMMODITY_ID,
                   isAnonymous: _this2.saveMsg.isAnonymous,
                   commentContent: _this2.saveMsg.commentContent,
                   commentScore: _this2.saveMsg.commentScore,
                   imageArr: _this2.saveMsg.imageArr,
                   requestType: "application/x-www-form-urlencoded"
                 };
-                _context.next = 10;
+                _context.next = 6;
                 return _this2.$api.postCoop(req);
-              case 10:
+              case 6:
                 data = _context.sent;
                 console.log("data", data);
-                if (data.ResultCode == "100") {} else {
+                if (data.ResultCode == "100") {
-                  allTrue = false;
-                }
-              case 13:
-                i++;
-                _context.next = 5;
-                break;
-              case 16:
-                uni.hideLoading();
-                if (allTrue) {
                   uni.showToast({
                     title: "评价成功！"
                   });
@@ -415,8 +407,13 @@ var _default = {
                       delta: 1
                     });
                   }, 1000);
+                } else {
+                  uni.showToast({
+                    title: data.ResultDesc
+                  });
                 }
-              case 18:
+                uni.hideLoading();
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -518,20 +515,41 @@ var _default = {
           var _data = res.Data;
           console.log("订单详情", _data);
           _this.detailObj = _data;
+          console.log("_this.evaluateType", _this.evaluateType);
+          console.log("Number(_this.shopId)", Number(_this.shopId));
+          if (_this.evaluateType === "more") {
+            var list = _data.List;
+            var obj = {};
+            if (list && list.length > 0) {
+              list.forEach(function (item) {
+                if (item.COMMODITY_ID === Number(_this.shopId)) {
+                  obj = item;
+                }
+              });
+            }
+            _this.thisShopDetail = obj;
+            _this.currentShopName = obj.COMMODITY_NAME;
+            _this.storeMsg.MERCHANTS_LOGO = obj.IMAGE_PATH;
+            if (obj.COMMENT_STATE === 1) {
+              _this.handleGetEvaluateDetail();
+            }
+          } else {
             if (_data.COMMENT_STATE === 1) {
               _this.handleGetEvaluateDetail();
             }
             // 拿到商品列表
-          var list = _data.List;
+            var _list = _data.List;
             var shopTitle = "";
-          if (list && list.length > 0) {
+            if (_list && _list.length > 0) {
-            shopTitle = list[0].COMMODITY_NAME;
+              _this.thisShopDetail = _list[0];
-            if (list.length > 1) {
+              shopTitle = _list[0].COMMODITY_NAME;
-              shopTitle += "\u7B49".concat(list.length, "\u4EF6\u5546\u54C1");
+              if (_list.length > 1) {
+                shopTitle += "\u7B49".concat(_list.length, "\u4EF6\u5546\u54C1");
               }
             }
             _this.currentShopName = shopTitle;
-          _this.storeMsg.MERCHANTS_LOGO = list[0].IMAGE_PATH;
+            _this.storeMsg.MERCHANTS_LOGO = _list[0].IMAGE_PATH;
+          }
         }
       });
     },
@@ -539,7 +557,7 @@ var _default = {
     handleGetEvaluateDetail: function handleGetEvaluateDetail() {
       var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var req, data;
+        var req, data, imgList;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -547,14 +565,25 @@ var _default = {
                 req = {
                   action_type: "getMallCommentList",
                   salebillId: _this3.orderInternal,
-                  salebillChildId: _this3.sellchildid || ""
+                  salebillChildId: _this3.sellchildid || "",
+                  commodityId: _this3.detailObj.List[0].COMMODITY_ID
                 };
                 _context2.next = 3;
                 return _this3.$api.getCoop(req);
               case 3:
                 data = _context2.sent;
                 console.log("data", data);
-              case 5:
+                _this3.thisShopDetail = data.Data.List[0];
+                _this3.saveMsg.commentContent = _this3.thisShopDetail.MALLCOMMENT_CONTENT;
+                _this3.saveMsg.imageArr = _this3.thisShopDetail.IMAGELIST;
+                imgList = [];
+                if (_this3.thisShopDetail.IMAGELIST && _this3.thisShopDetail.IMAGELIST.length > 0) {
+                  _this3.thisShopDetail.IMAGELIST.forEach(function (item) {
+                    imgList.push(item.IMAGE_URL);
+                  });
+                }
+                _this3.imgsList = imgList;
+              case 11:
               case "end":
                 return _context2.stop();
             }
@@ -582,6 +611,12 @@ var _default = {
     if (option.sellchildid) {
       this.sellchildid = option.sellchildid;
     }
+    if (option.evaluateType) {
+      this.evaluateType = option.evaluateType;
+    }
+    if (option.id) {
+      this.shopId = option.id;
+    }
     this.orderInternal = option.orderInternal;
 
     // 获取订单详情

unpackage/dist/dev/mp-weixin/pages/evaluateList/addEvaluate.wxml

@@ -1 +1 @@
-<view class="main data-v-4496319b"><view class="content _div data-v-4496319b"><view class="contentTop _div data-v-4496319b"><label class="title _span data-v-4496319b">您对商品满意吗？</label><checkbox class="anonymous data-v-4496319b" checked="{{saveMsg.isAnonymous}}" color="#CAA97F" data-event-opts="{{[['change',[['isAnonymous',['$event','$0'],['saveMsg']]]]]}}" bindchange="__e"><text class="data-v-4496319b">匿名评价</text></checkbox></view><view class="starRate _div data-v-4496319b"><image class="shopImg data-v-4496319b" mode="aspectFit" lazy-load="true" src="{{storeMsg.MERCHANTS_LOGO||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image><view class="rateBox _div data-v-4496319b"><view class="shopName _div data-v-4496319b">{{''+(currentShopName||"-")+''}}</view><uni-rate vue-id="4e3082cb-1" size="{{24}}" allowHalf="{{true}}" value="{{saveMsg.commentScore}}" data-event-opts="{{[['^change',[['changeRate',['$event','$0'],['saveMsg']]]],['^input',[['__set_model',['$0','commentScore','$event',[]],['saveMsg']]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4496319b" bind:__l="__l"></uni-rate></view></view><view class="textBox _div data-v-4496319b"><textarea cols="30" rows="5" disabled="{{detailObj.COMMENT_STATE!==1}}" placeholder="{{saveMsg.merchantsId?'说说这家店的口味、环境、服务':'商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'}}" data-event-opts="{{[['input',[['__set_model',['$0','commentContent','$event',[]],['saveMsg']]]]]}}" value="{{saveMsg.commentContent}}" bindinput="__e" class="data-v-4496319b"></textarea><view class="tip-text data-v-4496319b">评价文字不可少于3字</view><view class="photo-box data-v-4496319b"><block wx:for="{{imgsList}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="images data-v-4496319b"><image mode="aspectFit" src="{{item}}" data-event-opts="{{[['tap',[['seePhoto',['$0'],[[['imgsList','',i]]]]]]]}}" bindtap="__e" class="data-v-4496319b"></image><view data-event-opts="{{[['tap',[['deleteImg',[i]]]]]}}" bindtap="__e" class="_i data-v-4496319b"></view></view></block><view data-event-opts="{{[['tap',[['choeseImg',['$event']]]]]}}" class="add-photo data-v-4496319b" bindtap="__e"><view class="_i data-v-4496319b"></view>上传照片</view></view></view></view><block wx:if="{{detailObj.COMMENT_STATE!==1}}"><view class="submitBox _div data-v-4496319b"><view data-event-opts="{{[['tap',[['postRate',['$event']]]]]}}" class="submit _div data-v-4496319b" bindtap="__e">提交</view></view></block></view>
+<view class="main data-v-4496319b"><view class="content _div data-v-4496319b"><view class="contentTop _div data-v-4496319b"><label class="title _span data-v-4496319b">您对商品满意吗？</label><checkbox class="anonymous data-v-4496319b" checked="{{saveMsg.isAnonymous}}" color="#CAA97F" data-event-opts="{{[['change',[['isAnonymous',['$event','$0'],['saveMsg']]]]]}}" bindchange="__e"><text class="data-v-4496319b">匿名评价</text></checkbox></view><view class="starRate _div data-v-4496319b"><image class="shopImg data-v-4496319b" mode="aspectFit" lazy-load="true" src="{{storeMsg.MERCHANTS_LOGO||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image><view class="rateBox _div data-v-4496319b"><view class="shopName _div data-v-4496319b">{{''+(currentShopName||"-")+''}}</view><uni-rate vue-id="4e3082cb-1" size="{{24}}" allowHalf="{{true}}" value="{{saveMsg.commentScore}}" data-event-opts="{{[['^change',[['changeRate',['$event','$0'],['saveMsg']]]],['^input',[['__set_model',['$0','commentScore','$event',[]],['saveMsg']]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4496319b" bind:__l="__l"></uni-rate></view></view><view class="textBox _div data-v-4496319b"><textarea cols="30" rows="5" disabled="{{detailObj.COMMENT_STATE===1}}" placeholder="{{saveMsg.merchantsId?'说说这家店的口味、环境、服务':'商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'}}" data-event-opts="{{[['input',[['__set_model',['$0','commentContent','$event',[]],['saveMsg']]]]]}}" value="{{saveMsg.commentContent}}" bindinput="__e" class="data-v-4496319b"></textarea><view class="tip-text data-v-4496319b">评价文字不可少于3字</view><view class="photo-box data-v-4496319b"><block wx:for="{{imgsList}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="images data-v-4496319b"><image mode="aspectFit" src="{{item}}" data-event-opts="{{[['tap',[['seePhoto',['$0'],[[['imgsList','',i]]]]]]]}}" bindtap="__e" class="data-v-4496319b"></image><view data-event-opts="{{[['tap',[['deleteImg',[i]]]]]}}" bindtap="__e" class="_i data-v-4496319b"></view></view></block><view data-event-opts="{{[['tap',[['choeseImg',['$event']]]]]}}" class="add-photo data-v-4496319b" bindtap="__e"><view class="_i data-v-4496319b"></view>上传照片</view></view></view></view><block wx:if="{{detailObj.COMMENT_STATE!==1}}"><view class="submitBox _div data-v-4496319b"><view data-event-opts="{{[['tap',[['postRate',['$event']]]]]}}" class="submit _div data-v-4496319b" bindtap="__e">提交</view></view></block></view>

unpackage/dist/dev/mp-weixin/pages/evaluateList/index.js

@@ -300,6 +300,11 @@ var _default = {
     },
     goEvaluate: function goEvaluate(obj) {
       console.log("obj", obj);
+      if (obj.IMAGELIST && obj.IMAGELIST.length >= 2) {
+        uni.navigateTo({
+          url: "/pages/evaluateList/selectEvaluate?sellchildid=" + obj.SALEBILL_CHILD_ID + "&orderInternal=" + obj.SALEBILL_ID + "&orderStatus=" + obj.SALEBILL_STATE + "&SUPPLIER_NAME=" + obj.SUPPLIER_NAME
+        });
+      } else {
         uni.navigateTo({
           url: "/pages/evaluateList/addEvaluate?sellchildid=" + obj.SALEBILL_CHILD_ID + "&orderInternal=" + obj.SALEBILL_ID + "&orderStatus=" + obj.SALEBILL_STATE + "&SUPPLIER_NAME=" + obj.SUPPLIER_NAME
         });
@@ -307,6 +312,7 @@ var _default = {
         //   url: `/pages/evaluateList/addEvaluate?SALEBILL_ID=${obj.SALEBILL_ID}&SALEBILL_CHILD_ID=${obj.SALEBILL_CHILD_ID}`,
         // });
       }
+    }
   },
   onReachBottom: function onReachBottom() {}
 };

unpackage/dist/dev/mp-weixin/pages/highwayHeadlines/detail.js

@@ -144,7 +144,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -166,6 +166,10 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -183,6 +187,14 @@ var _default = {
     }
   },
   methods: {
+    // 预览查看
+    handleShowPreview: function handleShowPreview(url) {
+      uni.previewImage({
+        current: url,
+        // 当前显示图片的http链接
+        urls: [url] // 需要预览的图片http链接列表
+      });
+    },
     hanldeGetDetail: function hanldeGetDetail(id) {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -213,6 +225,7 @@ var _default = {
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/highwayHeadlines/detail.wxml

@@ -1 +1 @@
-<view class="main _div data-v-24542bf6"><view class="pageTitle _div data-v-24542bf6">{{detailObj.NOTICEINFO_TITLE||""}}</view><view class="time _div data-v-24542bf6">{{detailObj.START_DATE||"-"}}</view><block wx:if="{{$root.g0}}"><view class="navList _div data-v-24542bf6"><image class="img data-v-24542bf6" src="{{detailObj.ImageList[0].ImageUrl}}"></image></view></block><text class="content data-v-24542bf6">{{detailObj.NOTICEINFO_CONTENT||""}}</text></view>
+<view class="main _div data-v-24542bf6"><view class="pageTitle _div data-v-24542bf6">{{detailObj.NOTICEINFO_TITLE||""}}</view><view class="time _div data-v-24542bf6">{{detailObj.START_DATE||"-"}}</view><block wx:if="{{$root.g0}}"><view class="navList _div data-v-24542bf6"><image class="img data-v-24542bf6" src="{{detailObj.ImageList[0].ImageUrl}}" data-event-opts="{{[['tap',[['handleShowPreview',['$0'],['detailObj.ImageList.__$n0.ImageUrl']]]]]}}" bindtap="__e"></image></view></block><text class="content data-v-24542bf6">{{detailObj.NOTICEINFO_CONTENT||""}}</text></view>

unpackage/dist/dev/mp-weixin/pages/order/orderFoodDetail/index.js

@@ -717,8 +717,9 @@ var _default = {
       _this.orderAmount = total;
     },
     goEvaluate: function goEvaluate() {
+      console.log("this.orderInfo", this.orderInfo);
       uni.navigateTo({
-        url: "/pages/newEvaluate/main?merchantsId=" + this.orderInfo.MERCHANTS_ID + "&saleBillId=" + this.orderInfo.SALEBILL_ID
+        url: "/pages/evaluateList/addEvaluate?merchantsId=" + this.orderInfo.MERCHANTS_ID + "&orderInternal=" + this.orderInfo.SALEBILL_ID + "&sellchildid=" + (this.orderInfo.SALEBILL_CHILD_ID || "")
       });
     },
     goShop: function goShop() {

unpackage/dist/dev/mp-weixin/pages/user/index.js

@@ -155,6 +155,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _vuex = __webpack_require__(/*! vuex */ 33);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -240,6 +242,8 @@ var _default = {
     }
     // 拿车牌号
     this.handleGetCarCode();
+    // 拿用户信息
+    this.handleGetUserDetail();
   },
   computed: _objectSpread(_objectSpread({}, (0, _vuex.mapGetters)({
     user: "user"
@@ -255,6 +259,32 @@ var _default = {
     }
   }),
   methods: {
+    // 拿到用户详情
+    handleGetUserDetail: function handleGetUserDetail() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var userData;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this2.$api.getCoop({
+                  action_type: "GetMembershipInfo",
+                  WechatUserId: _this2.user.WechatUserId
+                });
+              case 2:
+                userData = _context.sent;
+                _this2.userInfo = userData.Data;
+                console.log("this.userInfo", _this2.userInfo);
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
     // 跳转去售后 即已完成的列表
     handleGo: function handleGo(url) {
       uni.navigateTo({

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

@@ -7,6 +7,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "pages/evaluateList/index",
+                    "pathName": "pages/evaluateList/index",
+                    "query": "type=2&pageType=UnionMall",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "pages/shopMallPage/user/index",
                     "pathName": "pages/shopMallPage/user/index",