Fix(特产&文玩管理):[#962]店铺/商品的链接配置功能

pages.json

@@ -43,7 +43,7 @@
       }
     },
     {
-      "path": "components/chose-city/chose-city",
+      "path": "pages/chose-city/chose-city",
       "style": {
         "navigationBarTitleText": "选择城市"
       }

pages/chose-city/chose-city.vue

@@ -2,22 +2,45 @@
   <view class="chose-city">
     <view class="header">
       <view class="search-box flex jc-between ai-center">
-        <input type="text" v-model="keyword" placeholder="搜索城市" placeholder-style="color:#999" @confirm="search">
+        <input
-        <image class="icon" :src="webUrl+'/20220903142935869059.png'" mode="scaleToFill" @click="search"></image>
+          v-model="keyword"
+          type="text"
+          placeholder="搜索城市"
+          placeholder-style="color:#999"
+          @confirm="search"
+        >
+        <image
+          :src="webUrl + '/20220903142935869059.png'"
+          class="icon"
+          mode="scaleToFill"
+          @click="search"
+        />
       </view>
     </view>
-
     <view class="aside">
-      <view class="item flex jc-center ai-center" :class="index === navActive ? 'on' : ''"
+      <view
-            v-for="(item, index) in listGroup" :key="index" @click="asideTap(index)">
+        v-for="(item, index) in listGroup"
+        :key="index"
+        :class="index === navActive ? 'on' : ''"
+        class="item flex jc-center ai-center"
+        @click="asideTap(index)"
+      >
         <view class="name">{{ item.label }}</view>
       </view>
     </view>
-
     <view class="content">
-      <mescroll-body ref="mescrollRef" top="16rpx" bottom="0" class='cotent-scroll' :up="upOption" :down="downOption"
+      <mescroll-body
-                     @up="upCallback" @down="downCallback" @init="mescrollInit" @emptyclick="emptyClick">
+        ref="mescrollRef"
-
+        :up="upOption"
+        :down="downOption"
+        top="16rpx"
+        bottom="0"
+        class='cotent-scroll'
+        @up="upCallback"
+        @down="downCallback"
+        @init="mescrollInit"
+        @emptyclick="emptyClick"
+      >
         <view class="fixed-box">
           <view class="line-location flex ai-center">
             <image :src="webUrl + '/20220903142929759087.png'" mode="scaleToFill"></image>
@@ -26,36 +49,36 @@
               <image :src="webUrl + '/20231215213824297278.png'" mode="scaleToFill" />
             </view>
           </view>
-
+          <image
-          <image class="banner" :src="banner.icon" mode="scaleToFill" v-if="banner"
+            v-if="banner"
-                 @click="$global.commonJump(banner.url)"/>
+            :src="banner.icon"
-
+            class="banner"
-          <!--          <view class="top-box" v-if="listTop.length">-->
+            mode="scaleToFill"
-          <!--            <view class="tips">特别推荐</view>-->
+            @click="bannerItemTapHandle(banner)"
-          <!--            <view class="top-list custom-list flex ai-center">-->
+          />
-          <!--              <view class="item" v-for="(item,index) in listTop" :key="index" @click="select(item)">-->
-          <!--                <view class="has-goods" v-if="type===0 && item.hasData===0">暂无特产</view>-->
-          <!--                <view class="has-goods" v-if="type>0 && type<6&& item.hasShop===0">暂无店铺</view>-->
-          <!--                <image :src="item.icon" mode="scaleToFill"></image>-->
-          <!--                <view class="one-t">{{ item.cityName }}</view>-->
-          <!--              </view>-->
-          <!--            </view>-->
-          <!--          </view>-->
         </view>
-
         <!--9-2 推荐信息-->
         <view class="recommendInfo" v-if="recommendInfo && type < 2">
           <template v-if="(type === 0 && recommendInfo.hotelList) || (type === 1 && recommendInfo.productList)">
             <view class="red-border-title">{{ recommendInfo.title }}</view>
-            <image class="bg-custom" :src="recommendInfo.backgroundImage" mode="scaleToFill"/>
+            <image
-
+              :src="recommendInfo.backgroundImage"
-            <scroll-view class="scroll-box flex" enable-flex scroll-x>
+              class="bg-custom"
-              <!--              :style="{'backgroundImage':`url(${recommendInfo.backgroundImage})`}"-->
+              mode="scaleToFill"
-
+            />
-
+            <scroll-view
-              <view class="item flex-0 flex flex-col jc-between ai-center"
+              enable-flex
+              scroll-x
+              class="scroll-box flex"
+            >
+              <template v-if="type === 0">
+                <view
                   v-for="(item,index) in recommendInfo.hotelList"
-                    :key="index" v-if="type===0" @click="goStore(item.hotelId)">
+                  :key="index"
+                  
+                  class="item flex-0 flex flex-col jc-between ai-center"
+                  @click="goToStore(item.hotelId || '')"
+                >
                   <image class="cover" :src="item.hotelImage" mode="scaleToFill" />
                   <image class="logo" :src="item.hotelLogo" mode="scaleToFill" />
                   <view style="width: 100%;box-sizing: border-box;padding:0 8rpx">
@@ -63,10 +86,15 @@
                     <rich-text class="text tc one-t" :nodes="item.hotelText" />
                   </view>
                 </view>
+              </template>
+              <template v-if="type === 1">
+                <view
+                  v-for="(item,index) in recommendInfo.productList"
+                  :key="index"
+                  class="item flex-0 flex flex-col jc-between ai-center"
                   
-              <view class="item flex-0 flex flex-col jc-between ai-center"
+                  @click="goToGoods(item.productId || '')"
-                    v-for="(item,index) in recommendInfo.productList" :key="index" v-if="type===1"
+                >
-                    @click="$global.navToGoods(item.productId)">
                   <image class="cover" :src="item.productImage" mode="scaleToFill" />
                   <image class="logo" :src="item.merLogo" mode="scaleToFill" />
                   <view style="width: 100%">
@@ -74,15 +102,17 @@
                     <rich-text class="text tc one-t" :nodes="item.productText" />
                   </view>
                 </view>
-
+              </template>
             </scroll-view>
           </template>
         </view>
-
-        <!--        province-name-->
         <view class="red-border-title" style="margin-left: 38rpx;">{{ provinceName }}</view>
         <view class="group-list custom-list flex flex-wrap">
-          <view class="item" v-for="(item, index) in listCity" :key="index" @click="select(item)">
+          <view class="item"
+            v-for="(item, index) in listCity"
+            :key="index"
+            @click="select(item)"
+          >
             <view class="has-goods" v-if="type === 0 && item.hasData === 0">暂无特产</view>
             <view class="has-goods" v-if="type > 0 && type < 6 && item.hasShop === 0">暂无店铺</view>
             <view class="has-goods" v-if="type === 6 && item.hasData === 0">暂无景点</view>
@@ -120,21 +150,18 @@ export default {
   ],
   data() {
     return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
       upOption: {
         noMoreSize: 10, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
         auto: false,
         empty: {
-          tip: '暂无城市' // 提示
+          tip: '暂无城市'
-          // btnText:'点击刷新'
         }
       },
       downOption: {
         auto: true
       },
-
-      webUrl: this.$VUE_APP_RESOURCES_URL,
       listGroup: [],
-      listTop: [],
       provinceName: "",
       listCity: [],
       navActive: 0,
@@ -142,7 +169,7 @@ export default {
       type: null,
       location: "",
       banner: {},
-      recommendInfo: null, // 推荐信息
+      recommendInfo: null // 推荐信息
     };
   },
   onLoad(options) {
@@ -190,7 +217,6 @@ export default {
         }
       })
     },
-
     async getMapData() {
       const map = await getLocation();
       if (map) {
@@ -199,18 +225,16 @@ export default {
         this.location = address[1].data.result.ad_info.city;
       }
     },
-
     init() {
       fetchCity(this.type).then(res => {
         if (res.success) {
           this.listGroup = res.data.group;
-          // this.listTop = res.data.tops;
           if (this.listGroup.length > 0) {
-            this.listTop = this.listGroup[0].top;
             this.listCity = this.listGroup[0].city;
             this.provinceName = this.listGroup[0].label;
             this.recommendInfo = this.listGroup[0].recommendInfo
             this.banner = {
+            ...this.listGroup[0],
               icon: this.listGroup[0].icon,
               url: this.listGroup[0].uniappUrl
             }
@@ -220,11 +244,11 @@ export default {
     },
     asideTap(index) {
       this.navActive = index;
-      this.listTop = this.listGroup[index].top;
       this.listCity = this.listGroup[index].city;
       this.provinceName = this.listGroup[index].label;
       this.recommendInfo = this.listGroup[index].recommendInfo
       this.banner = {
+        ...this.listGroup[index],
         icon: this.listGroup[index].icon,
         url: this.listGroup[index].uniappUrl
       }
@@ -277,12 +301,43 @@ export default {
           break;
       }
     },
-
+    goToStore(id) {
-    goStore(id) {
+      if (!id) {
+        return
+      }
       uni.navigateTo({
         url: "/pagesInn/inn/innHome?id=" + id
       })
     },
+    goToGoods(productId) {
+      if (!productId) {
+        return
+      }
+      this.$global.navToGoods(productId)
+    },
+    bannerItemTapHandle(banner) {
+      if (!banner) {
+        return
+      }
+      const url = banner.url || ''
+      if (url) {
+        this.$global.commonJump(url)
+      } else {
+        const linkType = banner.linkType
+        if (linkType > 0) {
+          switch(linkType) {
+            case 1:
+              this.goToStore(banner.linkHotelId)
+              break
+            case 2:
+              this.goToGoods(banner.linkProductId)
+              break
+            default:
+              break
+          }
+        }
+      }
+    }
   }
 };
 </script>

pages/cloud/cloud.vue

@@ -5,7 +5,12 @@
     </view>
 
     <view class="nav-box">
-      <view class="item flex-0" v-for="(item,index) in typeList" @click="changeType(index)">
+      <view
+        v-for="(item, index) in typeList"
+        :key="index"
+        class="item flex-0"
+        @click="changeType(index)"
+      >
         <image :src="item.icon" mode="scaleToFill"></image>
         <view class="nav">{{item.name}}</view>
       </view>
@@ -98,7 +103,7 @@
     methods: {
       goCity() {
         uni.navigateTo({
-          url:`/components/chose-city/chose-city?type=2&city=${this.cityName}`
+          url:`/pages/chose-city/chose-city?type=2&city=${this.cityName}`
         })
       },
       //获取当前定位地址

pages/cloud/haveFun.vue

@@ -38,7 +38,7 @@ export default {
   methods: {
     goCity() {
       uni.navigateTo({
-        url: `/components/chose-city/chose-city?type=2&city=${this.cityName}`
+        url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
       })
     },
 
@@ -120,8 +120,12 @@ export default {
 
       <view class="list" v-if="hotelList.length">
         <custom-waterfalls-flow :value="hotelList" imageKey="cover">
-          <view class="item" v-for="(item,index) in hotelList" slot="slot{{index}}"
+          <view
-                @click="goInnDetail(item)">
+            v-for="(item,index) in hotelList"
+            :key="index"
+            class="item"
+            @click="goInnDetail(item)"
+          >
             <view class="cover-box">
               <image class="cover" :src="item.cover" mode="scaleToFill"></image>
               <view class="my-mask">

pagesInn/inn/innHome.vue

@@ -1,34 +1,63 @@
 <template>
   <view class="container">
     <!-- title="店铺主页" -->
-    <hx-navbar :fixed="true" statusBarFontColor="#ffffff" barPlaceholder="hidden" transparent="auto" color='#ffffff'
+    <hx-navbar
-               :background-color="[[13,197,197],[13,197,197]]" :pageScroll.sync="scrollData"/>
+      :fixed="true"
-
+      :background-color="[[13,197,197],[13,197,197]]"
+      :pageScroll.sync="scrollData"
+      statusBarFontColor="#ffffff"
+      barPlaceholder="hidden"
+      transparent="auto"
+      color='#ffffff'
+    />
     <!--    7-3-->
-    <image class="fixed-share" :src="webUrl+'/20230619110913307276.png'" @click="changeShare"
+    <image
-           v-if="posterUrl.length>0"/>
+      v-if="posterUrl.length > 0"
-    <u-popup :show="showShare" mode="center" bgColor="transparent">
+      :src="webUrl + '/20230619110913307276.png'"
+      class="fixed-share"
+      @click="changeShare"
+    />
+    <u-popup
+      :show="showShare"
+      mode="center"
+      bgColor="transparent"
+    >
       <view class="box-share">
         <view class="box-img">
-          <image class="icon" :src="webUrl+'/20230608112219219303.png'" @click="changeShare"/>
+          <image
-          <image class="main-img" :src="posterUrl"/>
+            :src="webUrl + '/20230608112219219303.png'"
+            class="icon"
+            @click="changeShare"
+          />
+          <image :src="posterUrl" class="main-img" />
         </view>
-        <image class="btn" :src="webUrl+'/20230608112210135038.png'" @click="saveImg"/>
+        <image
+          :src="webUrl + '/20230608112210135038.png'"
+          class="btn"
+          @click="saveImg"
+        />
       </view>
     </u-popup>
-
     <view class="cover-box">
-      <image class="full-img" :src="inn.cover" mode="widthFix"></image>
+      <image
+        :src="inn.cover"
+        class="full-img"
+        mode="widthFix"
+      />
       <view class="box-mask flex jc-between ai-end">
         <view class="inn-name flex-0 more-t">{{ inn.name }}</view>
-        <view class="city-section flex jc-end ai-center" v-if="inn.cityName != undefined && inn.cityName.length>0">
+        <view
-          <image style="width: 22rpx;height: 22rpx;margin-right: 8rpx;" :src="webUrl+'/20210807215539157727.png'"
+          v-if="inn.cityName != undefined && inn.cityName.length > 0"
-                 mode=""></image>
+          class="city-section flex jc-end ai-center"
+        >
+          <image
+            :src="webUrl + '/20210807215539157727.png'"
+            style="width: 22rpx;height: 22rpx;margin-right: 8rpx;"
+          />
           <text class="one-t" style="font-size: 24rpx;color: #fff;">{{ inn.cityName }}</text>
         </view>
       </view>
     </view>
-
     <view class="innInfoWrap flex ai-end">
       <view class="inn-logo flex-0" style="">
         <image :src="inn.logo" v-if="inn.logo"></image>
@@ -37,12 +66,9 @@
 
       <view class="a3 flex jc-between ai-end" style="width:100%">
         <view class="inn-owner" style="flex-grow: 1;">{{ inn.ownerName }}/店主</view>
-
+        <view v-if="inn.guaranteeValue" class="guarantee flex jc-center ai-center">
-        <view class="guarantee flex jc-center ai-center" v-if="inn.guaranteeValue">保证金：{{
+          保证金：{{ inn.guaranteeValue }}元
-            inn.guaranteeValue
-          }}元
         </view>
-
         <view class="flex ai-center">
           <view class="zan-box flex flex-0 ai-end" @click="zanInn">
             <template v-if="isLike">
@@ -54,82 +80,92 @@
               <text style="font-size: 28rpx;color: #333333;">{{ inn.zan }}</text>
             </template>
           </view>
-
           <view class="flex flex-0 ai-end">
-            <image style="width: 32rpx;height: 32rpx;margin-left: 10rpx;" :src="webUrl+'/20240113230535491918.png'"
+            <image
-                   mode="scaleToFill" @click="doneFavorite" v-if="isFavorite"/>
+              v-if="isFavorite"
-            <image style="width: 32rpx;height: 32rpx;margin-left: 10rpx;" :src="webUrl+'/20240122093206161576.png'"
+              :src="webUrl + '/20240113230535491918.png'"
-                   mode="scaleToFill" @click="doneFavorite" v-else/>
+              style="width: 32rpx;height: 32rpx;margin-left: 10rpx;"
+              mode="scaleToFill"
+              @click="doneFavorite"
+            />
+            <image
+              v-else
+              :src="webUrl + '/20240122093206161576.png'"
+              style="width: 32rpx;height: 32rpx;margin-left: 10rpx;"
+              mode="scaleToFill"
+              @click="doneFavorite"
+            />
             <text style="font-size: 28rpx;color: #333333;">{{ favoriteCount }}</text>
           </view>
-
-        </view>
-
         </view>
       </view>
-
+    </view>
-    <view class="" style="padding: 0 32rpx;margin-top: 10rpx;">
+    <view style="padding: 0 32rpx;margin-top: 10rpx;">
       <view class="inn-signature">
         <text style="font-size: 24rpx;color: #080F1A;">{{ inn.content }}</text>
       </view>
     </view>
-
+    <view
-    <view v-if="inn.desc != null && inn.desc.length>0" class="" style="padding: 0 32rpx;margin-top: 30rpx;">
+      v-if="inn.desc != null && inn.desc.length > 0"
+      style="padding: 0 32rpx;margin-top: 30rpx;"
+    >
       <view class="desc-box">
         <text class="fixed">简介：</text>
         <rich-text :nodes="inn.desc"/>
-        <!--        <view v-html="handleRichText(inn.desc)"></view>-->
       </view>
     </view>
-
     <view class="map-wrap acea-row row-center">
-      <image style="height: 160rpx;width: 100%;" :src="webUrl+'/20210225151241154614.png'"></image>
+      <image
+        :src="webUrl + '/20210225151241154614.png'"
+        style="height: 160rpx;width: 100%;"
+      />
       <view class="address-block acea-row row-middle">
-        <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223747933873.png'"
+        <image
-               mode=""></image>
+          :src="webUrl + '/20220901223747933873.png'"
+          style="width: 32rpx;height: 32rpx;margin-right: 10rpx;"
+        />
         <text class="address-text">{{ inn.address }}</text>
       </view>
       <view class="buttons-block acea-row row-middle">
         <!-- call 拨打电话-->
         <!--        goRoom-->
         <view class="phone-block acea-row row-middle" @click="call">
-          <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223901017309.png'"
+          <image
-                 mode=""></image>
+            :src="webUrl + '/20220901223901017309.png'"
+            style="width: 32rpx;height: 32rpx;margin-right: 10rpx;"
+          />
           <text style="font-size: 24rpx;color: #41454d;">联系客服</text>
         </view>
         <view class="vline"></view>
         <view class="map-block acea-row row-middle" @click="showLocation">
-          <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223401590275.png'"
+          <image
-                 mode=""></image>
+            style="width: 32rpx;height: 32rpx;margin-right: 10rpx;"
+            :src="webUrl + '/20220901223401590275.png'"
+          />
           <text style="font-size: 24rpx;color: #41454d;">进入地图</text>
         </view>
       </view>
     </view>
 
-    <view class="top-tab acea-row row-middle row-center" style="margin-top: 60rpx;border-bottom: 1px solid #f5f5f5;">
+    <view
+      class="top-tab acea-row row-middle row-center"
+      style="margin-top: 60rpx;border-bottom: 1px solid #f5f5f5;"
+    >
       <view class="tab" @click="changeTab(0)">
-        <text class=""
+        <text :class="activeIndex === 0 ? 'tab-item-active' : 'tab-item-no-active'">企业文化</text>
-              :style="activeIndex==0?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">企业文化
+        <view v-show="activeIndex === 0" class="btLine"></view>
-        </text>
-        <view v-show="activeIndex==0" class="btLine"></view>
       </view>
       <view class="tab" style="margin-left: 70rpx;" @click="changeTab(1)">
-        <text class=""
+        <text :class="activeIndex === 1 ? 'tab-item-active' : 'tab-item-no-active'">最新资讯</text>
-              :style="activeIndex==1?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">最新资讯
+        <view v-show="activeIndex === 1" class="btLine"></view>
-        </text>
-        <view v-show="activeIndex==1" class="btLine"></view>
       </view>
       <view class="tab" style="margin-left: 70rpx;" @click="changeTab(2)">
-        <text class=""
+        <text :class="activeIndex === 2 ? 'tab-item-active' : 'tab-item-no-active'">商家资质</text>
-              :style="activeIndex==2?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">商家资质
+        <view v-show="activeIndex === 2" class="btLine"></view>
-        </text>
-        <view v-show="activeIndex==2" class="btLine"></view>
       </view>
       <view class="tab" style="margin-left: 70rpx;" @click="changeTab(3)" v-show="inn.hasProduct>0">
-        <text class=""
+        <text :class="activeIndex === 3 ? 'tab-item-active' : 'tab-item-no-active'">商品</text>
-              :style="activeIndex==3?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">商品
+        <view v-show="activeIndex === 3" class="btLine"></view>
-        </text>
-        <view v-show="activeIndex==3" class="btLine"></view>
       </view>
     </view>
 
@@ -190,8 +226,17 @@
     </view>
 
     <!-- 商家资质 -->
-    <view style="padding: 32rpx" v-if="activeIndex===2">
+    <view
-      <image class="store-img" :src="item.image" mode="widthFix" v-for="item in inn.qualifications"/>
+      v-if="activeIndex===2"
+      style="padding: 32rpx"
+    >
+      <image
+        v-for="(item, index) in inn.qualifications"
+        :key="index"
+        :src="item.image"
+        class="store-img"
+        mode="widthFix"
+      />
     </view>
 
     <!-- v4 商品列表 -->
@@ -253,7 +298,11 @@ export default {
       picColumnWidth: '325rpx',
       scrollData: {},
       infoArray: [],
-      inn: {},
+      inn: {
+        cityName: '',
+        pics: [],
+        desc: ''
+      },
       isMyInn: false, //是否是自己的客栈
       goodsList: [],
       goodsPage: 1,
@@ -1095,4 +1144,12 @@ export default {
   line-height: 40rpx;
   color: #A6AAB3;
 }
+.tab-item-active {
+  color:#080F1A;
+  font-size:32rpx;
+}
+.tab-item-no-active {
+  color:#A6AAB3;
+  font-size:28rpx;
+}
 </style>

pkg_product/views/nativeList.vue

@@ -73,7 +73,7 @@ export default {
   methods: {
     goCity() {
       uni.redirectTo({
-        url: `/components/chose-city/chose-city?type=0&city=${this.cityName}`
+        url: `/pages/chose-city/chose-city?type=0&city=${this.cityName}`
       })
     },
     init() {

v4/views/specialty/specialty.vue

@@ -69,7 +69,7 @@ export default {
   methods: {
     goCity() {
       uni.redirectTo({
-        url: `/components/chose-city/chose-city?type=0&city=${this.cityName}`
+        url: `/pages/chose-city/chose-city?type=0&city=${this.cityName}`
       })
     },
     goDetils(id) {

wenwan/views/storeList.vue

@@ -78,7 +78,7 @@ export default {
     },
     goCity() {
       uni.redirectTo({
-        url: `/components/chose-city/chose-city?type=1&city=${this.cityName}`
+        url: `/pages/chose-city/chose-city?type=1&city=${this.cityName}`
       })
     },
     goStore: function (item) {