update

pages.json

@@ -78,7 +78,8 @@
 				{
 					"path": "addComplaints",
 					"style": {
-						"navigationBarTitleText": "优质文明服务监督"
+						"navigationBarTitleText": "优质文明服务监督",
+						"navigationStyle": "custom"
 					}
 				}
 			]

pages/allFunPage/index.vue

@@ -50,7 +50,7 @@ export default {
     };
   },
   onLoad(query) {
-    let funList = uni.getStorageSync("funList");
+    let funList = uni.getStorageSync("funList1");
     if (funList) {
       funList = JSON.parse(funList);
     }
@@ -64,7 +64,7 @@ export default {
     this.$utils.addUserBehaviorNew();
   },
   onUnload() {
-    uni.setStorageSync("funList", JSON.stringify(this.allFunList));
+    uni.setStorageSync("funList1", JSON.stringify(this.allFunList));
   },
   methods: {
     // ETC的功能

pages/complaints/addComplaints.vue

@@ -1,5 +1,9 @@
 <template>
     <view class="feedback-page">
+        <!-- 因为说扫码进入不要微信小程序自带的 返回首页按钮  那就只能 去掉自带的标题内容 自己搞了 -->
+        <div class="mainTop" :style="{ height: menu.bottom + 6 + 'px', paddingTop: menu.top + 'px' }">
+            <div class="pageTitle" :style="{ height: menu.height + 'px' }">优质文明服务监督</div>
+        </div>
         <!-- 头部区域 -->
         <view class="header-section">
             <view class="header-bg">
@@ -216,8 +220,8 @@ export default {
             tagList: [], // 可选择的建议标签
             selectTags: [], // 已选中的建议标签
             currentService: {}, // 当前服务区信息
-            detailSuggestion: {} // 当前投诉建议的详情内容
+            detailSuggestion: {}, // 当前投诉建议的详情内容
-
+            menu: {}, // 手机的配置信息
         }
     },
     computed: {
@@ -247,6 +251,9 @@ export default {
             });
         }
 
+        this.menu = uni.getMenuButtonBoundingClientRect();
+        console.log('menumenumenumenumenumenu', this.menu);
+
 
 
         console.log('optionoptionoption', option);
@@ -741,6 +748,19 @@ export default {
     position: relative;
 }
 
+.mainTop {
+    width: 100%;
+    background-color: #f8f8f8;
+    box-sizing: border-box;
+    .pageTitle{
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 14px;
+    }
+}
+
 /* 头部区域 */
 .header-section {
     position: relative;

pages/index/index.vue

@@ -8,7 +8,7 @@
     <view class="topBox" :style="{
       height: menu.bottom + 14 + 'px',
       backgroundImage:
-        pageType === 'spring' 
+        pageType === 'spring'
           ? `url(https://eshangtech.com/minTestImg/springPageBg.png)`
           : `url(https://eshangtech.com/minTestImg/pageBg.png)`,
     }">
@@ -514,12 +514,19 @@ export default {
           springSrc: "/static/images/home/springCarRental.svg",
         },
         {
-          label: "投诉建议",
+          label: "司机之家",
-          value: 9,
+          value: 6,
-          index: 9,
+          index: 8,
-          src: "/static/images/home/suggestion.svg",
+          src: "/static/images/home/driverHome.svg",
-          springSrc: "/static/images/home/springSuggestion.svg",
+          springSrc: "/static/images/home/springDriverHome.svg",
         },
+        // {
+        //   label: "投诉建议",
+        //   value: 9,
+        //   index: 9,
+        //   src: "/static/images/home/suggestion.svg",
+        //   springSrc: "/static/images/home/springSuggestion.svg",
+        // },
         {
           label: "保险",
           value: 8,
@@ -561,14 +568,7 @@ export default {
           index: 15,
           src: "/static/images/home/ureaIcon.svg",
           springSrc: "/static/images/home/springUrea.svg",
-        },
+        }
-        {
-          label: "司机之家",
-          value: 6,
-          index: 8,
-          src: "/static/images/home/driverHome.svg",
-          springSrc: "/static/images/home/springDriverHome.svg",
-        },
       ],
       allFun: {
         label: "全部功能",
@@ -682,7 +682,7 @@ export default {
     } else {
       this.getLocalServer();
     }
-    let funList = uni.getStorageSync("funList");
+    let funList = uni.getStorageSync("funList1");
     if (funList) {
       let newFunList = JSON.parse(funList);
       if (newFunList && newFunList.length > 0) {
@@ -692,7 +692,7 @@ export default {
       }
       this.funList = newFunList;
     } else {
-      uni.setStorageSync("funList", JSON.stringify(this.funList));
+      uni.setStorageSync("funList1", JSON.stringify(this.funList));
     }
 
     await this.handleGetAdvertisementData()
@@ -783,7 +783,7 @@ export default {
 
     }
 
-    let funList = uni.getStorageSync("funList");
+    let funList = uni.getStorageSync("funList1");
     if (funList) {
       let newFunList = JSON.parse(funList);
       if (newFunList && newFunList.length > 0) {
@@ -1226,12 +1226,19 @@ export default {
               src: "/static/images/home/carRental.svg",
               springSrc: "/static/images/home/springCarRental.svg",
             },
+            // {
+            //   label: "投诉建议",
+            //   value: 9,
+            //   index: 9,
+            //   src: "/static/images/home/suggestion.svg",
+            //   springSrc: "/static/images/home/springSuggestion.svg",
+            // },
             {
-              label: "投诉建议",
+              label: "司机之家",
-              value: 9,
+              value: 6,
-              index: 9,
+              index: 8,
-              src: "/static/images/home/suggestion.svg",
+              src: "/static/images/home/driverHome.svg",
-              springSrc: "/static/images/home/springSuggestion.svg",
+              springSrc: "/static/images/home/springDriverHome.svg",
             },
             {
               label: "保险",
@@ -1274,16 +1281,10 @@ export default {
               index: 15,
               src: "/static/images/home/ureaIcon.svg",
               springSrc: "/static/images/home/springUrea.svg",
-            }, {
-              label: "司机之家",
-              value: 6,
-              index: 8,
-              src: "/static/images/home/driverHome.svg",
-              springSrc: "/static/images/home/springDriverHome.svg",
             },
           ]
           _this.triggered = false
-          uni.setStorageSync("funList", JSON.stringify(_this.funList));
+          uni.setStorageSync("funList1", JSON.stringify(_this.funList));
           resolve(true)
         }, 300);
 

pages/order/orderdetail/reasonforRefund.vue

@@ -3,14 +3,9 @@
     <view class="title">请选择退款原因</view>
     <scroll-view class="scrollView" scroll-y>
       <radio-group class="radio-group" @change="onReasonChange">
-        <label
+        <label class="radio-item" v-for="(item, index) in reasons" :key="index" :style="{
-          class="radio-item"
+          alignItems: index + 1 === reasons.length ? 'flex-start' : '',
-          v-for="(item, index) in reasons"
+        }">
-          :key="index"
-          :style="{
-            alignItems: index + 1 === reasons.length ? 'flex-start' : '',
-          }"
-        >
           <radio :value="item.value" :checked="item.checked" />
           <text>{{ item.label }}</text>
           <!-- <textarea
@@ -23,30 +18,16 @@
         </label>
       </radio-group>
 
-      <radio-group
+      <radio-group v-if="childrenReasons && childrenReasons.length > 0" class="radio-group" style="margin-top: 40rpx"
-        v-if="childrenReasons && childrenReasons.length > 0"
+        @change="onChildrenReasonChange">
-        class="radio-group"
+        <label class="radio-item" v-for="(item, index) in childrenReasons" :key="index" :style="{
-        style="margin-top: 40rpx"
+          alignItems:
-        @change="onChildrenReasonChange"
+            item.value === 2099 || item.value === 1099 ? 'flex-start' : '',
-      >
+        }">
-        <label
-          class="radio-item"
-          v-for="(item, index) in childrenReasons"
-          :key="index"
-          :style="{
-            alignItems:
-              item.value === 2099 || item.value === 1099 ? 'flex-start' : '',
-          }"
-        >
           <radio :value="item.value" :checked="item.checked" />
           <text>{{ item.label }}</text>
-          <textarea
+          <textarea v-if="item.value === 2099 || item.value === 1099" v-model="otherReason" class="other-input"
-            v-if="item.value === 2099 || item.value === 1099"
+            placeholder="请输入具体原因" :disabled="selectedChildrenReason !== selectedChildrenReason" />
-            v-model="otherReason"
-            class="other-input"
-            placeholder="请输入具体原因"
-            :disabled="selectedChildrenReason !== selectedChildrenReason"
-          />
         </label>
       </radio-group>
     </scroll-view>
@@ -69,13 +50,14 @@ export default {
       childrenReasons: [], // 子集原因列表
       selectedChildrenReason: "", // 选择的子集
       selectedChildrenText: "", // 选择的子集名称
+      isClick: false,// 判断是否已经点击了 退款
     };
   },
   computed: {
     ...mapGetters(["user"]),
   },
   async onLoad(query) {
-    console.log('queryqueryquery',query)
+    console.log('queryqueryquery', query)
     // 拿到要退款的订单id
     if (query.salebillId) {
       this.orderInternal = query.salebillId;
@@ -112,21 +94,21 @@ export default {
           salebillId: _this.orderInternal,
           // saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
         })
-        console.log('resresresresres',res)
+      console.log('resresresresres', res)
-        // .then((res) => {
+      // .then((res) => {
-          if (res.ResultCode === "100") {
+      if (res.ResultCode === "100") {
-            let _data = res.Data;
+        let _data = res.Data;
 
-            if(_data.List && _data.List.length>0){
+        if (_data.List && _data.List.length > 0) {
-              _data.List.forEach((item)=>{
+          _data.List.forEach((item) => {
-                item.AVERAGE_PRICE = item.AVERAGE_PRICE.toFixed(2)
+            item.AVERAGE_PRICE = item.AVERAGE_PRICE.toFixed(2)
-              })
+          })
-            }
+        }
 
-            _this.orderInfo = _data;
+        _this.orderInfo = _data;
-            console.log('_this.orderInfo_this.orderInfo_this.orderInfo',_this.orderInfo)
+        console.log('_this.orderInfo_this.orderInfo_this.orderInfo', _this.orderInfo)
-          }
+      }
-        // });
+      // });
     },
 
     onChildrenReasonChange(e) {
@@ -165,6 +147,10 @@ export default {
       // }
     },
     async onSubmit() {
+      if (this.isClick) {
+        return
+      }
+
       if (!this.selectedReason) {
         uni.showToast({
           title: "请选择退款原因",
@@ -192,6 +178,9 @@ export default {
         return;
       }
 
+
+      this.isClick = true
+
       let _this = this;
       let openId = uni.getStorageSync("openId");
       let reqOrder = {
@@ -199,11 +188,10 @@ export default {
         salebillType: 3999,
         provinceCode: _this.user.PROVINCE_CODE || "530000",
         serverpartShopId: "5634",
-        salebillDesc: `${this.selectedReasonText}:${
+        salebillDesc: `${this.selectedReasonText}:${this.selectedChildrenText === "其他原因"
-          this.selectedChildrenText === "其他原因"
+          ? this.otherReason
-            ? this.otherReason
+          : this.selectedChildrenText
-            : this.selectedChildrenText
+          }`,
-        }`,
         wechatOpenId: openId || "",
         oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
         wechatUnionId: _this.user.USER_UNIONID || "",
@@ -211,9 +199,10 @@ export default {
         t_saleorderdetail: JSON.stringify(_this.orderInfo.List),
         requestType: "application/x-www-form-urlencoded",
       };
-      console.log('reqOrderreqOrderreqOrder',reqOrder)
+      console.log('reqOrderreqOrderreqOrder', reqOrder)
       // return
       const orderData = await _this.$api.postCoop(reqOrder);
+
       if (orderData.ResultCode === "100") {
         const req = {
           action_type: "UpdateOrderState",
@@ -239,6 +228,7 @@ export default {
           title: orderData.ResultDesc,
           icon: "none",
         });
+        this.isClick = false
       }
     },
   },

pages/shopMallPage/user/newIndex.vue

@@ -141,7 +141,7 @@
                             :style="{ width: userInfo && userInfo.INDUSTRY_MEMBERSHIP_ID ? 'calc((100% - 2px) / 3)' : 'calc((100% - 2px) / 2)' }">
                             <view class="CouponItemValue">{{
                                 $utils.handleFormatNumber(userInfo.MEMBERSHIP_POINT || 0)
-                            }}</view>
+                                }}</view>
                             <view class="CouponItemLabel">积分</view>
                         </view>
                         <view class="line" v-if="userInfo && userInfo.INDUSTRY_MEMBERSHIP_ID"></view>
@@ -150,7 +150,7 @@
                             :style="{ width: userInfo && userInfo.INDUSTRY_MEMBERSHIP_ID ? 'calc((100% - 2px) / 3)' : 'calc((100% - 2px) / 2)' }">
                             <view class="CouponItemValue">{{
                                 $utils.handleFormatNumber(userInfo.ACCOUNT_BALANCE || 0)
-                            }}</view>
+                                }}</view>
                             <view class="CouponItemLabel">工会福利</view>
                         </view>
                     </view>
@@ -317,9 +317,13 @@
                 <view class="customerServiceTitle">客服帮助</view>
 
                 <view class="customerServiceContent">
-                    <view class="customerServiceItem" @click="handleGoCustomerService">
+                    <view class="customerServiceItem">
-                        <view class="customerServiceItemTitle">客服帮助</view>
+                        <button class="no-border-btn" hover-class="none" hover-start-time="0" hover-stay-time="0"
-                        <view class="customerServiceItemContent">伴您行程无忧</view>
+                            style="background-color: transparent;border-width: 0;padding: 0;" open-type="contact"
+                            @contact="onContact">
+                            <view class="customerServiceItemTitle">客服帮助</view>
+                            <view class="customerServiceItemContent">伴您行程无忧</view>
+                        </button>
                     </view>
                     <view class="customerServiceItem customerServiceItemBg2">
                         <view class="customerServiceItemTitle">服务热线</view>
@@ -598,6 +602,10 @@ export default {
         handleSaveOrderStore()
     },
     methods: {
+        onContact(e) {
+            console.log('用户点击客服，回调detail：', e.detail);
+            // e.detail.path / query 等可用于透传会话来源
+        },
         // 跳转客服帮助
         handleGoCustomerService() {
             uni.navigateTo({ url: "/pages/useConfig/customerService" });
@@ -1856,6 +1864,19 @@ export default {
                     box-sizing: border-box;
                     padding: 20rpx;
 
+                    /* 覆盖系统生成的伪元素 */
+                    .no-border-btn::after,
+                    .no-border-btn::before {
+                        content: '' !important;
+                        border: 0 !important;
+                        box-shadow: none !important;
+                        display: none !important;
+                        height: 0 !important;
+                        width: 0 !important;
+                        -webkit-transform: scale(0) !important;
+                        transform: scale(0) !important;
+                    }
+
                     .customerServiceItemTitle {
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 500;

pages/user/index.vue

@@ -295,10 +295,16 @@
         <view class="customerServiceTitle">客服帮助</view>
 
         <view class="customerServiceContent">
-          <view class="customerServiceItem" @click="handleGoCustomerService">
+          <view class="customerServiceItem">
-            <view class="customerServiceItemTitle">客服帮助</view>
+            <button class="no-border-btn" hover-class="none" hover-start-time="0" hover-stay-time="0"
-            <view class="customerServiceItemContent">伴您行程无忧</view>
+              style="background-color: transparent;border-width: 0;padding: 0;" open-type="contact"
+              @contact="onContact">
+              <view class="customerServiceItemTitle">客服帮助</view>
+              <view class="customerServiceItemContent">伴您行程无忧</view>
+            </button>
           </view>
+
+
           <view class="customerServiceItem customerServiceItemBg2">
             <view class="customerServiceItemTitle">服务热线</view>
             <view class="customerServiceItemContent" style="color: #182145;">伴您行程无忧</view>
@@ -646,6 +652,10 @@ export default {
     this.handleRefresh()
   },
   methods: {
+    onContact(e) {
+      console.log('用户点击客服，回调detail：', e.detail);
+      // e.detail.path / query 等可用于透传会话来源
+    },
     // 下拉刷新处理
     async handleRefresh() {
       try {
@@ -2134,6 +2144,19 @@ export default {
           box-sizing: border-box;
           padding: 20rpx;
 
+          /* 覆盖系统生成的伪元素 */
+          .no-border-btn::after,
+          .no-border-btn::before {
+            content: '' !important;
+            border: 0 !important;
+            box-shadow: none !important;
+            display: none !important;
+            height: 0 !important;
+            width: 0 !important;
+            -webkit-transform: scale(0) !important;
+            transform: scale(0) !important;
+          }
+
           .customerServiceItemTitle {
             font-family: PingFangSC, PingFang SC;
             font-weight: 500;

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -12922,7 +12922,7 @@ var staticImagePath = 'https://eshangtech.com/ShopICO';
 // let nodeUrl = 'https://es.robot-z.cn'
 var nodeUrl = 'https://es.eshangtech.com';
 var javaUrl = "https://admin.es.eshangtech.com/platform";
-// let javaUrl = `http://111.229.213.193:18075`
+// let javaUrl = `http://111.229.213.193:18071`
 // let javaUrl = `https://java.es.eshangtech.com:443`
 
 var zzyLocal = "https://eshangtech.com:18900/MemberApi";

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

@@ -186,7 +186,7 @@ var _default = {
     };
   },
   onLoad: function onLoad(query) {
-    var funList = uni.getStorageSync("funList");
+    var funList = uni.getStorageSync("funList1");
     if (funList) {
       funList = JSON.parse(funList);
     }
@@ -200,7 +200,7 @@ var _default = {
     this.$utils.addUserBehaviorNew();
   },
   onUnload: function onUnload() {
-    uni.setStorageSync("funList", JSON.stringify(this.allFunList));
+    uni.setStorageSync("funList1", JSON.stringify(this.allFunList));
   },
   methods: {
     // ETC的功能

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

@@ -354,12 +354,20 @@ var _default = {
         src: "/static/images/home/carRental.svg",
         springSrc: "/static/images/home/springCarRental.svg"
       }, {
-        label: "投诉建议",
+        label: "司机之家",
-        value: 9,
+        value: 6,
-        index: 9,
+        index: 8,
-        src: "/static/images/home/suggestion.svg",
+        src: "/static/images/home/driverHome.svg",
-        springSrc: "/static/images/home/springSuggestion.svg"
+        springSrc: "/static/images/home/springDriverHome.svg"
-      }, {
+      },
+      // {
+      //   label: "投诉建议",
+      //   value: 9,
+      //   index: 9,
+      //   src: "/static/images/home/suggestion.svg",
+      //   springSrc: "/static/images/home/springSuggestion.svg",
+      // },
+      {
         label: "保险",
         value: 8,
         index: 10,
@@ -395,12 +403,6 @@ var _default = {
         index: 15,
         src: "/static/images/home/ureaIcon.svg",
         springSrc: "/static/images/home/springUrea.svg"
-      }, {
-        label: "司机之家",
-        value: 6,
-        index: 8,
-        src: "/static/images/home/driverHome.svg",
-        springSrc: "/static/images/home/springDriverHome.svg"
       }],
       allFun: {
         label: "全部功能",
@@ -518,7 +520,7 @@ var _default = {
               } else {
                 _this2.getLocalServer();
               }
-              funList = uni.getStorageSync("funList");
+              funList = uni.getStorageSync("funList1");
               if (funList) {
                 newFunList = JSON.parse(funList);
                 if (newFunList && newFunList.length > 0) {
@@ -528,7 +530,7 @@ var _default = {
                 }
                 _this2.funList = newFunList;
               } else {
-                uni.setStorageSync("funList", JSON.stringify(_this2.funList));
+                uni.setStorageSync("funList1", JSON.stringify(_this2.funList));
               }
               _context.next = 13;
               return _this2.handleGetAdvertisementData();
@@ -641,7 +643,7 @@ var _default = {
                 _this5.handleGetChargingStation(_this5.serviceDetail);
               }
             case 10:
-              funList = uni.getStorageSync("funList");
+              funList = uni.getStorageSync("funList1");
               if (funList) {
                 newFunList = JSON.parse(funList);
                 if (newFunList && newFunList.length > 0) {
@@ -1155,12 +1157,20 @@ var _default = {
                       index: 17,
                       src: "/static/images/home/carRental.svg",
                       springSrc: "/static/images/home/springCarRental.svg"
-                    }, {
+                    },
-                      label: "投诉建议",
+                    // {
-                      value: 9,
+                    //   label: "投诉建议",
-                      index: 9,
+                    //   value: 9,
-                      src: "/static/images/home/suggestion.svg",
+                    //   index: 9,
-                      springSrc: "/static/images/home/springSuggestion.svg"
+                    //   src: "/static/images/home/suggestion.svg",
+                    //   springSrc: "/static/images/home/springSuggestion.svg",
+                    // },
+                    {
+                      label: "司机之家",
+                      value: 6,
+                      index: 8,
+                      src: "/static/images/home/driverHome.svg",
+                      springSrc: "/static/images/home/springDriverHome.svg"
                     }, {
                       label: "保险",
                       value: 8,
@@ -1197,15 +1207,9 @@ var _default = {
                       index: 15,
                       src: "/static/images/home/ureaIcon.svg",
                       springSrc: "/static/images/home/springUrea.svg"
-                    }, {
-                      label: "司机之家",
-                      value: 6,
-                      index: 8,
-                      src: "/static/images/home/driverHome.svg",
-                      springSrc: "/static/images/home/springDriverHome.svg"
                     }];
                     _this.triggered = false;
-                    uni.setStorageSync("funList", JSON.stringify(_this.funList));
+                    uni.setStorageSync("funList1", JSON.stringify(_this.funList));
                     resolve(true);
                   }, 300);
                 }));

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

@@ -528,6 +528,10 @@ var _default = {
     this.handleRefresh();
   },
   methods: {
+    onContact: function onContact(e) {
+      console.log('用户点击客服，回调detail：', e.detail);
+      // e.detail.path / query 等可用于透传会话来源
+    },
     // 下拉刷新处理
     handleRefresh: function handleRefresh() {
       var _this4 = this;

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

@@ -589,6 +589,18 @@
   background-image: url('https://eshangtech.com/caiyunyiImg/customerServiceItem1.png');
   box-sizing: border-box;
   padding: 20rpx;
+  /* 覆盖系统生成的伪元素 */
+}
+.main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::after,
+.main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::before {
+  content: '' !important;
+  border: 0 !important;
+  box-shadow: none !important;
+  display: none !important;
+  height: 0 !important;
+  width: 0 !important;
+  -webkit-transform: scale(0) !important;
+  transform: scale(0) !important;
 }
 .main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .customerServiceItemTitle.data-v-137d5072 {
   font-family: PingFangSC, PingFang SC;

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

@@ -2,7 +2,8 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "caiyunyi",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "urlCheck": false
   },
   "condition": {
     "miniprogram": {

utils/api.js

@@ -15,7 +15,7 @@ let staticImagePath = 'https://eshangtech.com/ShopICO'
 let nodeUrl = 'https://es.eshangtech.com'
 
 let javaUrl = `https://admin.es.eshangtech.com/platform`
-// let javaUrl = `http://111.229.213.193:18075`
+// let javaUrl = `http://111.229.213.193:18071`
 // let javaUrl = `https://java.es.eshangtech.com:443`
 
 let zzyLocal = `https://eshangtech.com:18900/MemberApi`