update

pages/eventRegistration/index.vue

@@ -105,11 +105,33 @@ export default {
 
     // 跳转到活动详情
     goToDetail(event) {
+      if (Number(event.ACTIVITY_TYPE) === 1000) {
         uni.navigateTo({
           url: `/pages/eventRegistration/detail?id=${event.ACTIVITY_ID}`
         });
+      } else {
+        let currentService = uni.getStorageSync("currentService");
+        uni.navigateTo({
+          url: `/pages/shopMallPage/shopType/index?selectIndex=3&comeForm=serviceDetail&comeService=${this.processString(currentService.SERVERPART_NAME)}`,
+        });
+      }
     },
+    processString(inputString) {
+      // 定义要检查的关键字
+      const keywords = ['服务区', '停车区', '加水站', '加油站', '观景台', '休息区'];
 
+      // 遍历关键字，检查是否包含在字符串中
+      for (let keyword of keywords) {
+        const index = inputString.indexOf(keyword);
+        if (index !== -1) {
+          // 截取关键字之前的部分
+          return inputString.substring(0, index);
+        }
+      }
+
+      // 如果没有找到任何关键字，返回原始字符串
+      return inputString;
+    },
     // 获取活动状态文本
     getStatusText(status) {
       if (new Date(status.ACTIVITY_ENDDATE).getTime() < new Date().getTime()) {

pages/serviceDetail/index.vue

@@ -228,7 +228,6 @@
               </view>
             </view>
           </view>
-
           <!-- 车辆维修 -->
           <view class="vehicleMaintenance" v-if="firstTab === 4">
             <!-- v-if="detailInfo.sumDetail.HASCHILD" -->
@@ -245,6 +244,15 @@
               </view>
             </view>
           </view>
+
+          <!-- 活动 -->
+          <view class="activityBox" v-if="firstTab === 5">
+            <swiper class="activityBoxItem" autoplay interval="3000">
+              <swiper-item v-for="(item, index) in activityImgList" :key="index" @click="handleGoActivity(index)">
+                <image class="cover-image" :src="item" mode="aspectFill" />
+              </swiper-item>
+            </swiper>
+          </view>
         </view>
       </view>
 
@@ -658,6 +666,7 @@ export default {
         { label: "充电", value: 2 },
         { label: "停车场", value: 3 },
         { label: "汽修", value: 4 },
+        { label: "活动", value: 5 },
       ], // 加油 充电 停车场 的tab
       firstTab: 1,
       secondTabList: [
@@ -676,7 +685,9 @@ export default {
         use: 0,
       }, // 充电桩数据
       nearScenic: [],// 景点列表
-      pageType: ""
+      pageType: "",
+      activityList: [],// 活动列表数据
+      activityImgList: [],// 图片列表
     };
   },
   async onLoad(query) {
@@ -703,6 +714,10 @@ export default {
     }
 
     await this.handleGetNearScenic()
+    // 获得当前服务区的 活动列表
+    await this.handleGetActivityList()
+
+
     // this.$utils.addUserBehaviorNew();
     this.$utils.addUserBehaviorNew({
       behaviorRecordDesc: `查看了${this.detailInfo.SERVERPART_NAME}详情`
@@ -732,6 +747,66 @@ export default {
     }),
   },
   methods: {
+    processString(inputString) {
+      // 定义要检查的关键字
+      const keywords = ['服务区', '停车区', '加水站', '加油站', '观景台', '休息区'];
+
+      // 遍历关键字，检查是否包含在字符串中
+      for (let keyword of keywords) {
+        const index = inputString.indexOf(keyword);
+        if (index !== -1) {
+          // 截取关键字之前的部分
+          return inputString.substring(0, index);
+        }
+      }
+
+      // 如果没有找到任何关键字，返回原始字符串
+      return inputString;
+    },
+    // 跳转去对应的活动页面
+    handleGoActivity(index) {
+      let obj = this.activityList[index]
+      console.log('objobj', obj);
+      if (Number(obj.ACTIVITY_TYPE) === 1000) {
+        uni.navigateTo({
+          url: `/pages/eventRegistration/detail?id=${obj.ACTIVITY_ID}`
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/shopMallPage/shopType/index?selectIndex=3&comeForm=serviceDetail&comeService=${this.processString(this.detailInfo.SERVERPART_NAME)}`,
+        });
+      }
+    },
+    // 获取服务区 活动列表
+    async handleGetActivityList() {
+      const req = {
+        SearchParameter: {
+          PROVINCE_CODE: '530000',
+          ACTIVITY_STATES: "1,2",
+          SERVERPART_IDS: this.detailInfo.SERVERPART_ID
+        },
+        PageIndex: 1,
+        PageSize: 10,
+        type: 'encryption'
+      }
+      const data = await this.$api.$posMemberPost(
+        "/Member/GetACTIVITYList",
+        req
+      );
+
+      let list = data.Result_Data.List
+      let imgList = []
+      if (list && list.length > 0) {
+        list.forEach((item) => {
+          if (item.ImageList && item.ImageList.length > 0) {
+            let url = item.ImageList[0].ImageUrl
+            imgList.push(url)
+          }
+        })
+      }
+      this.activityList = list
+      this.activityImgList = imgList
+    },
     // 附近的景点
     async handleGetNearScenic() {
       // 
@@ -952,6 +1027,8 @@ export default {
       }
       obj.sumDetail = sumObj;
       this.detailInfo = obj;
+      console.log('this.detailInfothis.detailInfothis.detailInfo', this.detailInfo);
+
       uni.hideLoading();
     },
     // 跳转到选择服务区
@@ -1651,6 +1728,26 @@ export default {
             }
           }
         }
+
+        .activityBox {
+          width: 100%;
+          box-sizing: border-box;
+          background: #ffffff;
+          border-radius: 16rpx;
+
+          .activityBoxItem {
+            width: 100%;
+            box-sizing: border-box;
+            border-radius: 32rpx;
+            overflow: hidden;
+
+            .cover-image {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
+
       }
     }
 

pages/shopMallPage/shopType/index.vue

@@ -369,6 +369,7 @@ export default {
       hasWatched: 0,
       shopTopId: '',
       comeForm: "",// 来自
+      comeService: "",// 只有comeForm为 serviceDetail 才会有值 值代表当前服务区
     };
   },
   watch: {
@@ -449,6 +450,9 @@ export default {
 
     if (query.comeForm) {
       this.comeForm = query.comeForm;
+      if (this.comeForm === "serviceDetail") {
+        this.comeService = query.comeService;
+      }
     }
 
 
@@ -1107,6 +1111,7 @@ export default {
       console.log("this.pageType", this.pageType);
       console.log("this.leftId", this.leftId);
 
+      console.log("thisAllTypethisAllTypethisAllType", thisAllType);
       if (this.pageType === "UnionMall" && this.leftId) {
         if (thisAllType && thisAllType.length > 0) {
           thisAllType.forEach((item, index) => {
@@ -1115,7 +1120,16 @@ export default {
             }
           });
         }
+      } else if (this.comeService) {
+        if (thisAllType && thisAllType.length > 0) {
+          thisAllType.forEach((item, index) => {
+            if (this.comeService === item.UserdefinedType_Name) {
+              leftIndex = index;
             }
+          });
+        }
+      }
+      console.log("leftIndexleftIndex", leftIndex);
       console.log("list", list);
       console.log("thisAllType", thisAllType);
 

unpackage/dist/dev/mp-weixin/pages/evaluateList/components/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
+  "component": true,
-  "component": true
+  "usingComponents": {}
 }

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

@@ -229,6 +229,9 @@ var _default = {
       }, {
         label: "汽修",
         value: 4
+      }, {
+        label: "活动",
+        value: 5
       }],
       // 加油 充电 停车场 的tab
       firstTab: 1,
@@ -259,7 +262,10 @@ var _default = {
       // 充电桩数据
       nearScenic: [],
       // 景点列表
-      pageType: ""
+      pageType: "",
+      activityList: [],
+      // 活动列表数据
+      activityImgList: [] // 图片列表
     };
   },
   onLoad: function onLoad(query) {
@@ -303,11 +309,14 @@ var _default = {
               _context.next = 17;
               return _this2.handleGetNearScenic();
             case 17:
+              _context.next = 19;
+              return _this2.handleGetActivityList();
+            case 19:
               // this.$utils.addUserBehaviorNew();
               _this2.$utils.addUserBehaviorNew({
                 behaviorRecordDesc: "\u67E5\u770B\u4E86".concat(_this2.detailInfo.SERVERPART_NAME, "\u8BE6\u60C5")
               });
-            case 18:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -365,14 +374,88 @@ var _default = {
     user: "user"
   })),
   methods: {
-    // 附近的景点
+    processString: function processString(inputString) {
-    handleGetNearScenic: function handleGetNearScenic() {
+      // 定义要检查的关键字
+      var keywords = ['服务区', '停车区', '加水站', '加油站', '观景台', '休息区'];
+
+      // 遍历关键字，检查是否包含在字符串中
+      for (var _i = 0, _keywords = keywords; _i < _keywords.length; _i++) {
+        var keyword = _keywords[_i];
+        var index = inputString.indexOf(keyword);
+        if (index !== -1) {
+          // 截取关键字之前的部分
+          return inputString.substring(0, index);
+        }
+      }
+
+      // 如果没有找到任何关键字，返回原始字符串
+      return inputString;
+    },
+    // 跳转去对应的活动页面
+    handleGoActivity: function handleGoActivity(index) {
+      var obj = this.activityList[index];
+      console.log('objobj', obj);
+      if (Number(obj.ACTIVITY_TYPE) === 1000) {
+        uni.navigateTo({
+          url: "/pages/eventRegistration/detail?id=".concat(obj.ACTIVITY_ID)
+        });
+      } else {
+        uni.navigateTo({
+          url: "/pages/shopMallPage/shopType/index?selectIndex=3&comeForm=serviceDetail&comeService=".concat(this.processString(this.detailInfo.SERVERPART_NAME))
+        });
+      }
+    },
+    // 获取服务区 活动列表
+    handleGetActivityList: function handleGetActivityList() {
       var _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var req, data, res;
+        var req, data, list, imgList;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
+              case 0:
+                req = {
+                  SearchParameter: {
+                    PROVINCE_CODE: '530000',
+                    ACTIVITY_STATES: "1,2",
+                    SERVERPART_IDS: _this4.detailInfo.SERVERPART_ID
+                  },
+                  PageIndex: 1,
+                  PageSize: 10,
+                  type: 'encryption'
+                };
+                _context3.next = 3;
+                return _this4.$api.$posMemberPost("/Member/GetACTIVITYList", req);
+              case 3:
+                data = _context3.sent;
+                list = data.Result_Data.List;
+                imgList = [];
+                if (list && list.length > 0) {
+                  list.forEach(function (item) {
+                    if (item.ImageList && item.ImageList.length > 0) {
+                      var url = item.ImageList[0].ImageUrl;
+                      imgList.push(url);
+                    }
+                  });
+                }
+                _this4.activityList = list;
+                _this4.activityImgList = imgList;
+              case 9:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }))();
+    },
+    // 附近的景点
+    handleGetNearScenic: function handleGetNearScenic() {
+      var _this5 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var req, data, res;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 // 
                 req = {
@@ -382,30 +465,30 @@ var _default = {
                   PageIndex: 1,
                   PageSize: 10
                 };
-                _context3.next = 3;
+                _context4.next = 3;
-                return _this4.$api.$post("/EShangApiMain/WisdomServerpart/GetSCENICAREAList", req);
+                return _this5.$api.$post("/EShangApiMain/WisdomServerpart/GetSCENICAREAList", req);
               case 3:
-                data = _context3.sent;
+                data = _context4.sent;
                 res = data.Result_Data.List;
-                _this4.nearScenic = res;
+                _this5.nearScenic = res;
               case 6:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }))();
     },
     // 查询现在的充电桩
     handleGetChargingStation: function handleGetChargingStation(obj) {
-      var _this5 = this;
+      var _this6 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         var _this;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                _this = _this5;
+                _this = _this6;
                 uni.request({
                   url: "https://xny.yciccloud.com/interconnect/api/interconnection/open/getConnectList",
                   //仅为示例，并非真实接口地址。
@@ -461,10 +544,10 @@ var _default = {
                 });
               case 2:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4);
+        }, _callee5);
       }))();
     },
     handleChangeFirstTab: function handleChangeFirstTab(obj) {
@@ -489,28 +572,28 @@ var _default = {
     },
     // 查询服务区详情
     handleGetServerpartDetail: function handleGetServerpartDetail(id) {
-      var _this6 = this;
+      var _this7 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var currentService, seatInfo, req, data, obj, sumObj;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 currentService = uni.getStorageSync("currentService");
                 seatInfo = uni.getStorageSync("seatInfo");
-                _this6.seatInfo = JSON.parse(seatInfo);
+                _this7.seatInfo = JSON.parse(seatInfo);
                 req = {
                   ServerpartId: id || currentService.SERVERPART_ID,
-                  latitude: _this6.seatInfo.latitude,
+                  latitude: _this7.seatInfo.latitude,
-                  longitude: _this6.seatInfo.longitude
+                  longitude: _this7.seatInfo.longitude
                 };
                 uni.showLoading({
                   title: "加载中..."
                 });
-                _context5.next = 7;
+                _context6.next = 7;
-                return _this6.$api.$javaGet("/third-party/getServerPartInfo", req);
+                return _this7.$api.$javaGet("/third-party/getServerPartInfo", req);
               case 7:
-                data = _context5.sent;
+                data = _context6.sent;
                 // const data = await this.$api.$get(
                 //   "/CommercialApi/BaseInfo/GetServerpartInfo",
                 //   req
@@ -640,14 +723,15 @@ var _default = {
                   });
                 }
                 obj.sumDetail = sumObj;
-                _this6.detailInfo = obj;
+                _this7.detailInfo = obj;
+                console.log('this.detailInfothis.detailInfothis.detailInfo', _this7.detailInfo);
                 uni.hideLoading();
-              case 14:
+              case 15:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5);
+        }, _callee6);
       }))();
     },
     // 跳转到选择服务区
@@ -674,12 +758,12 @@ var _default = {
     },
     // 拿到精选商家数据
     handleGetMerchant: function handleGetMerchant() {
-      var _this7 = this;
+      var _this8 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
         var data, list;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
                 uni.showLoading({
                   title: "加载中..."
@@ -695,22 +779,22 @@ var _default = {
                 //   pageSize: 9999,
                 //   pageIndex: 1,
                 // });
-                _context6.next = 3;
+                _context7.next = 3;
-                return _this7.$api.$javaGet("/third-party/getMerchantsList", {
+                return _this8.$api.$javaGet("/third-party/getMerchantsList", {
-                  serverpartId: _this7.detailInfo.SERVERPART_ID
+                  serverpartId: _this8.detailInfo.SERVERPART_ID
                 });
               case 3:
-                data = _context6.sent;
+                data = _context7.sent;
                 // let list = data.Data.List;
                 list = data.Result_Data.List;
-                _this7.merchantList = list;
+                _this8.merchantList = list;
                 uni.hideLoading();
               case 7:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6);
+        }, _callee7);
       }))();
     },
     goShop: function goShop(item) {

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

@@ -530,6 +530,22 @@
   width: 64rpx;
   height: 64rpx;
 }
+.main .content .carDetailBox .firstContent .activityBox.data-v-49dced80 {
+  width: 100%;
+  box-sizing: border-box;
+  background: #ffffff;
+  border-radius: 16rpx;
+}
+.main .content .carDetailBox .firstContent .activityBox .activityBoxItem.data-v-49dced80 {
+  width: 100%;
+  box-sizing: border-box;
+  border-radius: 32rpx;
+  overflow: hidden;
+}
+.main .content .carDetailBox .firstContent .activityBox .activityBoxItem .cover-image.data-v-49dced80 {
+  width: 100%;
+  height: 100%;
+}
 .main .content .otherFacilities.data-v-49dced80 {
   width: 100%;
   background: #fff;

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

@@ -290,7 +290,9 @@ var _default = {
       lastStartIndex: 0,
       hasWatched: 0,
       shopTopId: '',
-      comeForm: "" // 来自
+      comeForm: "",
+      // 来自
+      comeService: "" // 只有comeForm为 serviceDetail 才会有值 值代表当前服务区
     };
   },
 
@@ -367,6 +369,9 @@ var _default = {
     }
     if (query.comeForm) {
       this.comeForm = query.comeForm;
+      if (this.comeForm === "serviceDetail") {
+        this.comeService = query.comeService;
+      }
     }
     var shopCarList = [];
     if (this.pageType === "UnionMall") {
@@ -1015,6 +1020,7 @@ var _default = {
               leftIndex = -1;
               console.log("this.pageType", _this8.pageType);
               console.log("this.leftId", _this8.leftId);
+              console.log("thisAllTypethisAllTypethisAllType", thisAllType);
               if (_this8.pageType === "UnionMall" && _this8.leftId) {
                 if (thisAllType && thisAllType.length > 0) {
                   thisAllType.forEach(function (item, index) {
@@ -1023,7 +1029,16 @@ var _default = {
                     }
                   });
                 }
+              } else if (_this8.comeService) {
+                if (thisAllType && thisAllType.length > 0) {
+                  thisAllType.forEach(function (item, index) {
+                    if (_this8.comeService === item.UserdefinedType_Name) {
+                      leftIndex = index;
                     }
+                  });
+                }
+              }
+              console.log("leftIndexleftIndex", leftIndex);
               console.log("list", list);
               console.log("thisAllType", thisAllType);
               if (leftIndex === -1) {
@@ -1168,7 +1183,7 @@ var _default = {
               }
               console.log("现在的小类", _this8.leftTypeList);
               uni.hideLoading();
-            case 30:
+            case 32:
             case "end":
               return _context5.stop();
           }

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

@@ -9,16 +9,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/shopMallPage/shopCar/index",
+          "name": "pages/serviceDetail/index",
-          "pathName": "pages/shopMallPage/shopCar/index",
+          "pathName": "pages/serviceDetail/index",
-          "query": "pageType=",
+          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
-          "name": "pages/order/orderdetail/index",
-          "pathName": "pages/order/orderdetail/index",
-          "query": "sellchildid=131841&orderInternal=131839&orderStatus=1010&SUPPLIER_NAME=undefined",
           "launchMode": "default",
           "scene": null
         }