样式优化

src/app.scss

@@ -106,7 +106,7 @@ view,text,div {
 .fz_w_text {
     width: 100%;
     color: #bcbcbc;
-    font-size: 24rpx;
+    font-size: 30rpx;
     text-align: center;
     padding: 30rpx 0 40rpx;
 }

src/components/bottom-nav/index.vue

@@ -0,0 +1,182 @@
+<template>
+  <view>
+    <view class="bottom-nav">
+      <view
+        v-for="(item, index) in navList"
+        :key="index"
+        class="nav-item"
+        :class="{ centerButton: item.isCenter }"
+        @click="onTabClick(index)"
+      >
+        <template v-if="index != 2">
+          <image
+            :src="
+              currentIndex === index ? item.selectedIconPath : item.iconPath
+            "
+            class="nav-icon"
+          />
+          <!-- 非中间按钮才显示文字 -->
+          <text
+            v-if="!item.isCenter"
+            :style="{ color: currentIndex === index ? item.color : '#000' }"
+          >
+            {{ item.text }}
+          </text>
+        </template>
+        <template v-if="index == 2">
+          <button type="info" class="nav-item custom-button" open-type="contact">
+            <image
+              :src="
+                currentIndex === index ? item.selectedIconPath : item.iconPath
+              "
+              class="nav-icon"
+            />
+            <!-- 非中间按钮才显示文字 -->
+            <text
+              v-if="!item.isCenter"
+              :style="{ color: currentIndex === index ? item.color : '#000' }"
+            >
+              {{ item.text }}
+            </text>
+          </button>
+        </template>
+      </view>
+    </view>
+  </view>
+</template>
+
+ 
+<script>
+import { post } from "@/request/api.js";
+export default {
+  data() {
+    return {
+      isRegister: -1,
+      registerGroup: [
+        {
+          name: "未注册",
+          value: 0,
+        },
+        {
+          name: "已注册，去绑定",
+          value: 1,
+        },
+      ],
+      navList: [
+        {
+          text: "首页",
+          iconPath: "/static/nav/home_.png",
+          selectedIconPath: "/static/nav/home.png",
+          path: "/pages/index/index",
+          color: "#18bb88",
+        },
+        {
+          text: "优选生活",
+          iconPath: "/static/nav/good_.png",
+          selectedIconPath: "/static/nav/good.png",
+          path: "/pages/sign/index",
+          color: "#18bb88",
+        },
+        {
+          text: "在线客服",
+          iconPath: "/static/nav/kf_.png",
+          selectedIconPath: "/static/nav/kf.png",
+          path: "/pages/shoppingMall/index",
+          color: "#18bb88",
+        },
+        {
+          text: "我的",
+          iconPath: "/static/nav/my_.png",
+          selectedIconPath: "/static/nav/my.png",
+          path: "/pages/my/index",
+          color: "#18bb88",
+        },
+      ],
+    };
+  },
+  props: {
+    currentIndex: {
+      type: Number,
+      default: 0,
+    },
+  },
+  methods: {
+    onTabClick(index) {
+      console.log(index)
+      const path = this.navList[index].path;
+
+      if (index != 2) {
+        uni.switchTab({ url: path });
+      } else if (index == 2) {
+      }
+    },
+  },
+};
+</script>
+ 
+<style scoped lang="scss">
+.safe-area {
+  height: constant(safe-area-inset-bottom);
+  height: env(safe-area-inset-bottom);
+  background: #ffffff; /* 跟 tabBar 一致 */
+}
+.bottom-nav {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 26rpx;
+  color: #000;
+  padding-bottom: env(safe-area-inset-bottom);
+  padding-top: 4rpx;
+  background-color: #fff;
+  border-top: 2rpx solid #eee;
+  padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.2 及以下 */
+  padding-bottom: env(safe-area-inset-bottom); /* iOS 11.2+ */
+}
+
+.nav-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+  padding: 14rpx 0;
+}
+
+.nav-icon {
+  width: 60rpx;
+  height: 60rpx;
+  margin-bottom: 4rpx;
+}
+
+.centerButton {
+  /* position: relative;
+  top: 10px;
+  z-index: 1000; */
+}
+
+.centerButton .nav-icon {
+  width: 47px;
+  height: 47px;
+}
+
+.custom-button {
+  // all: unset;
+  font-size: 26rpx;
+  line-height: 124%;
+  padding: 0;
+  border: none;
+  border-radius: 0;
+  margin: 0;
+  background-color: #fff;
+  overflow: visible;
+  
+}
+.custom-button::after{
+  border: none;
+}
+</style>

src/main.js

@@ -11,8 +11,8 @@ import "@/utils/run_now.js";
 
 import "@/static/font/DIN/din.css";
 
-import md5 from 'js-md5';
-Vue.prototype.$md5 = md5;
+// import md5 from 'js-md5';
+// Vue.prototype.$md5 = md5;
 
 import dayjs from 'dayjs';
 Vue.prototype.$day = dayjs;
@@ -42,7 +42,7 @@ Vue.prototype.goto = goto;  // 页面跳转
 Vue.prototype.tidyTpye = tidyTpye;  // 专区判断
 Vue.prototype.hotelStarF = hotelStarf;  // 酒店星级判断
 Vue.prototype.$toast = toast;  // toast
-
+Vue.prototype.$bus = new Vue()
 App.mpType = 'app'
 
 const app = new Vue({

src/pages.json

@@ -9,7 +9,7 @@
 		{
 			"path": "pages/sign/index",
 			"style": {
-				"navigationBarTitleText": "享好物"
+				"navigationBarTitleText": "优选生活"
 			}
 		},
 		{
@@ -230,13 +230,6 @@
 			"style": {
 				"navigationBarTitleText": "享好物"
 			}
-		},
-		{
-			"path": "pages/shoppingMall/index",
-			"style": {
-				"navigationBarTitleText": "商城购物",
-				"navigationStyle": "custom"
-			}
 		}
 	],
 	"subPackages": [
@@ -692,6 +685,7 @@
 	// 	}
 	// },
 	"tabBar": {
+		"custom": true,
 		"color": "#999",
 		"selectedColor": "#18bb88",
 		"borderStyle": "black",
@@ -703,17 +697,12 @@
 				"selectedIconPath": "static/nav/home.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/shoppingMall/index",
-				"iconPath": "static/nav/good_.png",
-				"selectedIconPath": "static/nav/good.png",
-				"text": "商城购物"
-			},
+			
 			{
 				"pagePath": "pages/sign/index",
 				"iconPath": "static/nav/good_.png",
 				"selectedIconPath": "static/nav/good.png",
-				"text": "享好物"
+				"text": "优选生活"
 			},
 			// {
 			// 	"pagePath": "pages/settledMerchant/index",
@@ -735,6 +724,7 @@
 			}
 		]
 	},
+	"usingComponents": {},
 	"easycom": {
 		"autoscan": true,
 		"custom": {

src/pages/index/index.vue

@@ -2,36 +2,28 @@
     <div class="Appindex">
         <!-- 顶部 -->
         <view class="head">
-            <!-- 轮播图 -->
-            <swiper-banner :radius="1" imgScale="5:2" :imgArr="BannerImg" :duration="1000" :interval="5000" :circular="true" :autoplay="true" @goList="goList" :indicator-dots="true" indicator-active-color="#12B280" indicator-color="rgba(255, 255, 255, .82)"></swiper-banner>
-            <!-- 轮播图-end -->
-            <!-- 公告 -->
-            <view class="head_notice clearfix">
-                <view class="notice_title" @click="goNoticeList">
-                    <image class="gg_img" src="/static/img/gg.png"></image>
+            <view  style="background-color: #fff; border-radius: 30rpx; padding: 0 0 2rpx;">
+                <!-- 轮播图 -->
+                <swiper-banner :radius="10" imgScale="5:3" :imgArr="BannerImg" :duration="1000" :interval="5000" :circular="true" :autoplay="true" @goList="goList" :indicator-dots="true" indicator-active-color="#12B280" indicator-color="rgba(255, 255, 255, .82)"></swiper-banner>
+                <!-- 轮播图-end -->
+                <!-- 公告 -->
+                <view class="head_notice clearfix flex_r flex_jb flex_ac">
+                    <view class="notice_title" @click="goNoticeList">
+                        <!-- <image class="gg_img" src="@/static/img/gg.png"></image> -->
+                        <span>公告</span>
+                    </view>
+                    <swiper class="notice_swiper" vertical autoplay circular :interval="5000" :duration="1000">
+                        <swiper-item v-for="(item, index) in not_list" :key="index" @click="toDetail(item.article_id)" sty>
+                            <text class="not_list ellipsis">{{ item.title }}</text>
+                            <!-- <text class="not_ico iconfont">&#xe62e;</text> -->
+                        </swiper-item>
+                    </swiper>
+                    <image class="gg_img" src="/static/my/menu1.png" @click="goNoticeList" />
                 </view>
-                <swiper class="notice_swiper" vertical autoplay circular :interval="5000" :duration="1000">
-                    <swiper-item v-for="(item, index) in not_list" :key="index" @click="toDetail(item.article_id)">
-                        <text class="not_list ellipsis">{{ item.title }}</text>
-                        <text class="not_ico iconfont">&#xe62e;</text>
-                    </swiper-item>
-                </swiper>
+                <!-- 公告-end -->
             </view>
-            <!-- 公告-end -->
             <!-- 专区入口 -->
             <div class="l_tabBar flex_r flex_jb">
-                <div class="search-box flex_r flex_jb flex_ac">
-                    <div class="district" @click="showAddress = !showAddress">
-                        <span>{{ LocationCity }}</span>
-                        <span class="iconfont">&#xe62f;</span>
-                    </div>
-                    <div class="search flex_r flex_jb flex_ac">
-                        <span class="iconfont">&#xe661;</span>
-                        <input v-model="searchKey" @confirm="toSearch" class="inp" placeholder="搜索你要的内容">
-                        <span class="search_btn" @click="toSearch">搜索</span>
-                    </div>
-                    <!-- <div class="scan-ico iconfont">&#xe8cf;</div> -->
-                </div>
                 <div class="item" v-for="(i,s) in tabs" :key="s" @click="goto(i.url)">
                     <img :src="i.ico" alt="" class="ico">
                     <!-- <div class="tit">{{ i.tit }}</div> -->
@@ -40,35 +32,11 @@
 
         </view>
 
-        <div class="list" v-if="list.length">
-            <div class="li_item" v-for="(i,s) in list" :key="s" @click="goMerchant(i)">
-                <div class="logo_img">
-                    <img :src="i.logo" alt="">
-                </div>
-                <div class="con_box">
-                    <div class="p1 ellipsis"><span class="topicon" v-if="i.is_recom == 1">⭐️</span>{{ i.name }}</div>
-                    <div class="p2">{{ i.address }}</div>
-                    <div class="p3">{{ $h.Div(i.distance, 1000).toFixed(2) }} km</div>
-                </div>
-            </div>
-        </div>
-        <not-goods v-else textStr="暂无附近商家"></not-goods>
-        <view class="fz_w_text">好生活，茶付宝！</view>
-        <!-- 城市选择 -->
-        <h-address @select="selectaddress" :visible.sync="showAddress" />
-        <!-- 隐私指引 -->
-        <!-- <xh-privacy title="隐私保护指引" color="#18bb88"></xh-privacy> -->
-        <!-- #ifdef APP-PLUS -->
-        <uni-popup ref="popup">
-            <view class="progressBox">
-                <icon type="loading" size="26"/>
-                <text class="words">下载中 请勿退出 {{ totalBytesWritten + " / " + totalBytesExpectedToWrite }}</text>
-            </view>
-        </uni-popup>
-        <!-- #endif -->
+        <shopping-mall></shopping-mall>
         <uni-popup ref="bannerPopup" class="bannerPopup">
             <image :src="bannerBig" mode="widthFix"></image>
         </uni-popup>
+        <bottom-nav></bottom-nav>
     </div>
 </template>
 <script>
@@ -79,12 +47,16 @@ import hAddress from "@/components/h-address/address.vue"; //城市选择
 import notGoods from "@/components/not-goods/index.vue";
 import { post } from "@/request/api.js";
 import { formatBytes } from "@/utils/index";
+import bottomNav from "@/components/bottom-nav/index.vue";
+import shoppingMall from "@/pages/shoppingMall/index.vue";
 export default {
     name: "Appindex",
     components: {
         swiperBanner, //轮播
         hAddress,
-        notGoods
+        notGoods,
+        bottomNav,
+        shoppingMall
         // xhPrivacy,
     },
     data() {
@@ -94,25 +66,11 @@ export default {
             homeImg: "", //活动列表
             productList: [], //商品数据
             searchKey: "", //搜索关键词
-            LocationCity: "中国",
-            showAddress: false,
             tabs: [],
-            totalBytesWritten: "0B", // 已经下载的数据长度
-            totalBytesExpectedToWrite: "0B", // 预期需要下载的数据总长度
-            filePath:"",
-            percentVal:0,
-            newAppInfo:{},
-            list: [],
-            Query: {
-                latitude: "",
-                longitude: "",
-                page: 1,
-                rows: 20,
-                city: "",
-                business: -1
-            },
             pageData: {},
             bannerBig: "",
+            tablist: [],
+            current: 0
         };
     },
     onLoad(option) {
@@ -123,22 +81,17 @@ export default {
         this.getToCity()
         // this.loadData()
         // uni.Luserfun()
-        // #ifdef APP-PLUS
-        this.getNewVersion()
-        // #endif
+        
     },
     onShow() {
         uni.setTabBarStyle({
             color: '#999',
             selectedColor: '#18bb88',
         })
-        this.Query.page = 1
-        this.list = []
-        this.pageData  = {}
         this.getBanner(); //获取轮播图
         this.getAnnounce(); //获取公告列表
         this.getTabs(); //获取专区
-        this.getList(); //商家列表
+        // this.getList(); //商家列表
     },
     onHide() {},
     methods: {
@@ -150,43 +103,6 @@ export default {
             });
             
         },
-        async getList(page) {
-            let { lat, lng } = await uni.Location();
-            this.Query.latitude = lat;
-            this.Query.longitude = lng;
-            if (page) {
-                this.list = []
-                this.Query.page = 1
-            }
-            post("v1/merchant/list", this.Query).then(res => {
-                if (res.code == 0) {
-                    let da = res.data.data
-                    delete res.data.data
-                    this.pageData = res.data
-                    this.list = [...this.list, ...da]
-                    this.Query.page++
-                }
-            })
-        },
-        getNewVersion(){
-            post("v1/getAppVersion").then((res) => {
-                if (res.code === 0) {
-                    console.log(res.data.data);
-                    if(plus.os.name == "Android"){
-                        this.filePath = res.data.data.android.url
-                        this.newAppInfo = res.data.data.android
-                        // 获取当前版本
-                        plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-                            console.log();
-                            if(wgtinfo.versionCode < this.newAppInfo.version){
-                                this.update()
-                            }
-                        });
-                    }
-                    
-                }
-            });
-        },
         // 跳转到商品详情页
         NavToGoodsDetail(id, type) {
             this.goto("/pages/product/p_details", { id, type });
@@ -286,109 +202,23 @@ export default {
                 }
             })
         },
-        // 选择城市
-        selectaddress(da) {
-            this.LocationCity = da.cityName;
-            this.showAddress = false;
-        },
-        update(){
-            const _this = this;
-            uni.showModal({
-                title: "版本更新",
-                content: "APP有新版本发布，点击 立即更新 进行最新版本下载。",
-                showCancel: this.newAppInfo.is_mast == 1 ? true: false,
-                confirmText: "立即更新",
-                cancelText: "稍后进行",
-                success: function (res) {
-                if (res.confirm) {
-                    _this.$refs.popup.open()
-                    
-                    // _this.show = true; // show变量控制一个下载进度弹框（这个UI样式自己写即可）
-                    // 创建一个下载任务，并根据后端返回的apk静态资源地址filePath进行下载
-                  
-                    let downloadTask = uni.downloadFile({
-                        url: _this.filePath,
-                        success: (res) => {
-                        console.log(res, "下载成功");
-                        this.updateProgressShow = false;
-                        if (res.statusCode === 200) {
-                            _this.$refs.popup.close()
-                            plus.runtime.install(
-                            res.tempFilePath,
-                            {},
-                            function () {
-                                console.log("install success...");
-                                plus.runtime.restart();
-                                // uni.hideLoading();
-                                uni.setStorageSync("wgtinfo", null);
-                            },
-                            function (e) {
-                                uni.showToast({
-                                    icon: "error",
-                                    title: "更新失败",
-                                    duration: 1500,
-                                });
-                            }
-                            );
-                        } else {
-                            _this.$refs.popup.close()
-                            uni.showToast({
-                                icon: "error",
-                                title: "更新失败",
-                                duration: 1500,
-                            });
-                        }
-                        },
-                        fail: (err) => {
-                            _this.$refs.popup.close()
-                            uni.showToast({
-                                icon: "error",
-                                title: "更新失败",
-                                duration: 1500,
-                            });
-                        },
-                    });
-                    downloadTask.onProgressUpdate((res) => {
-                        // console.log(res, "进度");
-                        // console.log("下载进度" + res.progress);
-                        // console.log("已经下载的数据长度" + res.totalBytesWritten);
-                        // console.log(
-                        //   "预期需要下载的数据总长度" + res.totalBytesExpectedToWrite
-                        // );
-                        let totalBytesWritten = formatBytes(res.totalBytesWritten);
-                        let totalBytesExpectedToWrite = formatBytes(
-                        res.totalBytesExpectedToWrite
-                        );
-                        let num1 = totalBytesWritten.fileSize.split(
-                        totalBytesWritten.matchUnit.unitName
-                        );
-                        let num2 = totalBytesExpectedToWrite.fileSize.split(
-                        totalBytesExpectedToWrite.matchUnit.unitName
-                        );
-                        _this.totalBytesWritten =
-                        Math.floor(num1[0] * 100) / 100 +
-                        totalBytesWritten.matchUnit.unitName;
-                        _this.totalBytesExpectedToWrite =
-                        Math.floor(num2[0] * 100) / 100 +
-                        totalBytesExpectedToWrite.matchUnit.unitName;
-                        _this.percentVal = res.progress;
-                    });
-                } else if (res.cancel) {
-                    console.log("稍后更新");
-                }
-                },
-            });
-    
+        
+        onChange(e){
+            console.log(e)
+            this.current = e.detail.current
         }
     },
     computed: {},
     watch: {},
     onReachBottom() {
-        if (this.Query.page <= this.pageData.last_page) this.getList();
+        this.$bus.$emit("onReachBottom");
     },
 };
 </script>
 <style scoped lang='scss'>
+.Appindex {
+    padding-bottom: 220rpx;
+}
 .head {
     padding: 12rpx 28rpx;
 }
@@ -410,19 +240,24 @@ export default {
 }
 
 .head_notice {
-    margin: 30rpx 0;
+    margin: 30rpx 0 10rpx;
+    padding: 0 10rpx 0;
 
     .notice_title {
-        width: 130rpx;
-        height: 40rpx;
+        width: 100rpx;
+        // height: 40rpx;
         float: left;
-
-        .gg_img {
-            width: 100%;
-            height: 40rpx;
-        }
+        text-align: center;
+        color: #fff;
+        font-size: 26rpx;
+        padding: 6rpx 0;
+        border-radius: 30rpx;
+        background-color: #D78C2E;
+    }
+    .gg_img {
+        width: 35rpx;
+        height: 24rpx;
     }
-
     .notice_swiper {
         height: 40rpx;
         padding-left: 20rpx;
@@ -432,7 +267,7 @@ export default {
         width: calc(100% - 130rpx);
 
         .not_list {
-            width: calc(100% - 50rpx);
+            width: calc(100% - 30rpx);
         }
 
         .not_ico {
@@ -445,16 +280,16 @@ export default {
         .not_ico {
             display: inline-block;
             vertical-align: middle;
-            height: 40rpx;
+            height: 45rpx;
             line-height: 40rpx;
         }
     }
 }
 
 .l_tabBar {
-    margin: 32rpx 0 20rpx;
+    margin: 32rpx 0 0;
     background-color: #fff;
-    padding: 10rpx 20rpx;
+    padding: 12rpx 20rpx;
     border-radius: 10rpx;
     box-shadow: 4rpx 4rpx 8rpx 4rpx rgba(0, 0, 0, 0.12);
     flex-wrap: wrap;
@@ -462,7 +297,7 @@ export default {
     .search-box {
         width: 100%;
         padding: 10rpx;
-        margin-bottom: 12rpx;
+        margin-bottom: 0;
 
         .district {
             font-size: 32rpx;
@@ -507,6 +342,102 @@ export default {
         }
     }
 
+    .swiper-1 {
+        padding: 10rpx;
+        height: 200px;
+        overflow: hidden;
+        position: relative;
+
+        ::v-deep.uni-swiper-dots-horizontal {
+            bottom: 3rpx !important;
+        }
+        ::v-deep.uni-swiper-dot {
+            width: 20rpx !important;
+            height: 8rpx !important;
+            border-radius: 0 !important;
+            margin-right: 0 !important;
+        }
+        ::v-deep .uni-swiper-dot-active {
+            background-color: #D78C2E;
+        }
+        ::v-deep .uni-swiper-dot:first-child {
+            overflow: hidden;
+            // border-radius: 4rpx 0 0 4rpx !important;
+            
+            border-bottom-left-radius: 4rpx !important;
+            border-top-left-radius:  4rpx !important;
+        }
+        ::v-deep.uni-swiper-dot:last-child {
+            // border-radius:  0 4rpx 4rpx 0  !important;
+            border-bottom-right-radius: 4rpx !important;
+            border-top-right-radius: 4rpx !important;
+        }
+
+        
+    }
+    .custom-dots {
+        display: flex;
+        justify-content: center;
+        margin-top: 10px;
+        position: absolute;
+        bottom: 3rpx;
+        left: 0;
+        right: 0;
+    }
+    .swiper-box {
+        position: relative;
+        display: grid;
+        grid-template-columns: repeat(7, 1fr);
+        overflow: auto;
+        
+    }
+    ::-webkit-scrollbar {
+        width: 2px;
+        height: 3px;
+    }
+    ::-webkit-scrollbar-thumb {
+        background:#D78C2E;
+        border-radius: 10px;
+    }
+    ::-webkit-scrollbar-track {
+        background-color: #f0f0f0;
+        border-radius: 10px;
+    }
+
+    .dot {
+        width: 20rpx !important;
+        height: 8rpx !important;
+        border-radius: 0 !important;
+        margin-right: 0 !important;
+        background: #D5D5D7;
+        transition: background-color 0.3s;
+    }
+    .dot.active {
+        background: #D78C2E;
+        width: 12px;
+        height: 12px;
+    }
+    ::v-deep .dot:first-child {
+        overflow: hidden;
+        // border-radius: 4rpx 0 0 4rpx !important;
+        
+        border-bottom-left-radius: 4rpx !important;
+        border-top-left-radius:  4rpx !important;
+    }
+    ::v-deep.dot:last-child {
+        // border-radius:  0 4rpx 4rpx 0  !important;
+        border-bottom-right-radius: 4rpx !important;
+        border-top-right-radius: 4rpx !important;
+    }
+    .item_box {
+        display: grid;
+        grid-template-columns: repeat(5, 1fr); /* 一行5列，平均分配 */
+        grid-template-rows: repeat(2, 100px);  /* 两行，每行100px高 */
+        gap: 0;
+        overflow: hidden;    /* 超出隐藏 */
+        height: 210px;
+    }
+
     .item {
         width: 105rpx;
         margin: 10rpx 10rpx;

src/pages/my/index.vue

@@ -176,6 +176,7 @@
         <!-- <authorize-module ref="autho" :shopInfo="shopInfo" @authGetTelSuccess="onauthGetTelSuccess" /> -->
         <!-- 激活升级 -->
         <activation ref="activation" tit="激活" />
+        <bottom-nav :currentIndex="3"></bottom-nav>
     </view>
 </template>
 <script>
@@ -183,13 +184,15 @@
 let app = getApp();
 // #endif
 import uniCopy from "@/utils/copy";
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 import activation from "@/components/activation/activation.vue"
 import { post } from "@/request/api.js";
+import bottomNav from "@/components/bottom-nav/index.vue";
 export default {
     components: {
-        authorizeModule,
-        activation
+        // authorizeModule,
+        activation,
+        bottomNav
     },
     data() {
         return {
@@ -399,6 +402,7 @@ page {
 
 .container {
     box-sizing: border-box;
+    padding-bottom: 220rpx;
 }
 
 .content {

src/pages/product/p_details.vue

@@ -179,14 +179,14 @@ import mpHtml from "@/uni_modules/mp-html/components/mp-html/mp-html.vue"
 import swiperBanner from "@/components/swiperBanner/index.vue";
 import uniGoodsNav from "@/components/uni-goods-nav/uni-goods-nav.vue";
 import uniNumberBox from "@/components/uni-number-box/uni-number-box.vue";
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 export default {
     components: {
         mpHtml,
         uniGoodsNav,
         swiperBanner,
         uniNumberBox,
-        authorizeModule,
+        // authorizeModule,
     },
     data() {
         return {

src/pages/shoppingMall/index.vue

@@ -3,11 +3,6 @@
   <div class="container">
     <div
       class="l_tabBar flex_r flex_jb"
-      v-show="!head"
-      :style="{
-        background: `url(${banner.image}) no-repeat`,
-        'background-size': '100% 100%',
-      }"
     >
       <div class="search-box flex_r flex_jb">
         <div class="search flex_r flex_jb flex_ac">
@@ -22,16 +17,13 @@
         </div>
       </div>
     </div>
-    <div class="head" v-show="head">
-      <p class="title">商城购物</p>
-    </div>
     <!-- 平台-start -->
     <div class="nav_box flex_r">
       <div
         class="item flex_c flex_ac"
         v-for="(i, s) in platform"
         :key="s"
-        @click="goto(i.url + '&name=' + i.name)"
+        @click="toPlatform(i,s)"
       >
         <uni-badge
           size="small"
@@ -70,8 +62,65 @@
         <span>{{ i.cat_name }}</span>
       </div>
     </div>
+    <view class="product-list" v-if="goods.length > 0 && platformObj.type == 8">
+      <view
+        class="product"
+        v-for="(i, s) in goods"
+        :key="s"
+        @click="NavToGoodsDetail(i)"
+      >
+        <view class="image-view">
+          <image class="product-image" :src="i.goods.original_img"></image>
+        </view>
+        <view class="content-view">
+          <view :class="['product-title', 'ellipsis2']">{{
+            i.goods_name
+          }}</view>
+          <view class="product-price">
+            <text class="product-price-original product-price-original1">{{ i.cost_price }}</text>
+            <text class="product-text" v-if="['3', '4'].includes(type)"
+              >赠<text class="corFE2C15">{{ i.give_cha_bao }}</text
+              >贡献值</text
+            >
+          </view>
+          <view class="product-txt" v-if="type == 4">
+            <text class="product-price-favour">￥{{ i.market_price }}</text>
+            <text class="product-text">消费券抵</text>
+            <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
+          </view>
+          <!-- <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
+          <view class="product-txt" v-if="type == 6"
+            >每<text class="green">{{ i.interval_time }}</text> 分钟降价
+            <text class="green">{{ i.drop_range * 100 }}%</text>
+          </view>
+          <view class="product-txt" v-if="['3'].includes(type)"
+            >限时赠送<text class="corFE2C15">{{ i.teac }}</text
+            >TeaC</view
+          >
+          <view class="product-txt fenxiang" v-if="['3'].includes(type)">
+            <text class="iconfont red">&#xe62b;</text>
+            <text class="red"
+              >分享约获得{{ i.first_teac
+              }}{{ type == 3 ? "TeaC" : "现金" }}</text
+            >
+          </view>
+          <view v-if="['4'].includes(type)" class="flex_r flex_ac">
+            <view class="product-txt"
+              >赠<text class="corFE2C15">{{ i.teac }}</text
+              >TeaC</view
+            >
+            <!-- <view class="product-txt fenxiang" style="background-color: rgba(0, 0, 0, 0);">
+              <text class="iconfont red">&#xe62b;</text>
+              <text class="red"
+                >{{ i.first_teac }}</text
+              >
+            </view> -->
+          </view>
+        </view>
+      </view>
+    </view>
     <!-- 平台下分类-end -->
-    <view class="product-list" v-if="goods.length > 0 && platformObj.type != 5">
+    <view class="product-list" v-if="goods.length > 0 && platformObj.type != 5 && platformObj.type != 8">
       <view
         class="product"
         v-for="(i, s) in goods"
@@ -357,7 +406,7 @@
         </view>
       </view>
     </view>
-    <not-goods v-else textStr="暂无数据"></not-goods>
+    <not-goods v-if="goods.length <= 0" textStr="暂无数据"></not-goods>
     <!-- 精品推荐-end -->
     <view class="fz_w_text">好生活，茶付宝！</view>
   </div>
@@ -382,15 +431,17 @@ export default {
       banner: {}, // 顶部背景图
       ratio: 0, // 比例
       platformObj: {
-        type: 1,
+        type: 8,
       }, // 选中平台
       catObj: {
         cat_id: 0,
         cat_name: "",
       }, //选中的分类
+      type: 4, //享好物的固定类型
+      categoryId: 11,
     };
   },
-  async onShow() {
+  async mounted() {
     // this.platform = [];
     // this.navIndex = 0;
     // this.platformObj = {
@@ -408,12 +459,21 @@ export default {
       color: "#999",
       selectedColor: "#E68B1E",
     });
-    // page = 1;
-    // this.goods = [];
+    page = 1;
+    this.goods = [];
     this.duoduoCats();
     this.goodsDay();
+    this.$bus.$on("onReachBottom", (url) => {
+      console.log(this.platformObj.type)
+      if (page != -1) {
+        setTimeout(() => {
+          ++page;
+          this.goodsDay();
+        }, 500);
+      }
+    });
   },
-  onLoad(da) {
+  created(da) {
     this.getIcon();
     uni.setTabBarStyle({
       color: "#999",
@@ -424,19 +484,19 @@ export default {
   },
   onHide() {},
   onPageScroll(e) {
-    if (e.scrollTop > 0) {
-      this.head = true;
-    } else {
-      this.head = false;
-    }
+    // if (e.scrollTop > 0) {
+    //   this.head = true;
+    // } else {
+    //   this.head = false;
+    // }
   },
   methods: {
     // 获取平台
     getIcon() {
-      post("v1/cashback/getIcon").then((res) => {
+      post("v1/cashback/getIcon", {isApp: 1}).then((res) => {
         if (res.code === 0) {
           this.platform = res.data;
-          this.platform.length = 4; // 后期要去掉
+          this.platform.length = 5; // 后期要去掉
           this.platformObj = this.platform[this.navIndex];
           this.ratio = this.platform[this.navIndex].ratio;
         } else {
@@ -770,6 +830,46 @@ export default {
             uni.hideLoading();
           }
         });
+      } else if (this.platformObj.type == 8) {
+        let that = this;
+        let data = { page, type: 4, category_id: 11 };
+        post("v1/goods/categoryInfo", data).then((res) => {
+            if (res.code === 0) {
+                let obj = res.data.data.data;
+                console.log(obj);
+                if (page <= 1) that.goods = [];
+                if (obj.length > 0) {
+                    obj.forEach((e) => {
+                        that.goods.push(e);
+                    });
+                } else {
+                    if (page == 1) {
+                        that.haveGoods = true;
+                        page = -1;
+                    } else {
+                        page = -1;
+                        this.$toast("暂无更多");
+                    }
+                }
+                uni.hideLoading();
+            } else {
+                if (page == 1) {
+                    that.haveGoods = true;
+                    page = -1;
+                } else {
+                    page = -1;
+                    this.$toast("暂无更多");
+                }
+                uni.hideLoading();
+            }
+        });
+      }
+    },
+    toPlatform(i,s) {
+      if(i.url) {
+        this.goto(i.url + '&name=' + i.name)
+      } else {
+        this.changeNav(i, s);
       }
     },
     // 跳转到商品详情页
@@ -819,6 +919,8 @@ export default {
           promotion_start_time: item.promotion_start_time,
           promotion_end_time: item.promotion_end_time,
         });
+      } else if (this.platformObj.type == 8) {
+        this.goto("/pages/product/p_details", { id: item.id, type: 4 });
       }
     },
     copyMt(item){
@@ -1072,6 +1174,17 @@ page {
     }
   }
 
+  .product-price-original1 {
+       color: #18bb88;
+       font-size: 32rpx;
+       font-weight: bold;
+
+       &:before {
+           content: "￥";
+           font-size: 20rpx;
+       }
+   }
+
   .quan_box {
     min-height: 88rpx;
     font-size: 20rpx;
@@ -1095,7 +1208,7 @@ page {
     color: #888888;
     font-size: 22rpx;
     text-decoration: line-through;
-    margin-left: 20rpx;
+    // margin-left: 20rpx;
   }
 
   .product-tip {
@@ -1142,19 +1255,19 @@ page {
 // 活动-end
 
 .l_tabBar {
-  height: 400rpx;
+  // height: 400rpx;
   flex-wrap: wrap;
   padding: 10rpx 20rpx;
   border-radius: 10rpx;
-  margin: 0 0 20rpx;
+  margin: 0 0 30rpx;
   //   background: url("https://img1.baidu.com/it/u=3052557249,4146060588&fm=253&fmt=auto&app=138&f=JPEG?w=1000&h=465")
   // no-repeat;
-  background-size: 100% 100%;
+  // background-size: 100% 100%;
 
   .search-box {
     width: 100%;
     padding: 10rpx;
-    margin-top: 68rpx;
+    // margin-top: 68rpx;
     margin-bottom: 12rpx;
 
     .district {
@@ -1183,7 +1296,7 @@ page {
       .inp {
         font-size: 25rpx;
         padding: 0 8rpx;
-        width: 300rpx;
+        width: 500rpx;
       }
 
       .search_btn {
@@ -1207,16 +1320,17 @@ page {
   padding: 20rpx 20rpx;
   border-radius: 20rpx;
   flex-wrap: wrap;
+  justify-content: space-between;
   background-color: #f5f6f8;
 
   .item {
-    width: 22%;
+    width: 17%;
     margin: 10rpx 10rpx;
   }
 
   .ico {
-    width: 72rpx;
-    height: 72rpx;
+    width: 62rpx;
+    height: 62rpx;
   }
 
   .tit {
@@ -1244,13 +1358,18 @@ page {
 .nav:nth-child(3) {
   border-right: 1rpx solid rgba($color: #a0a0a0, $alpha: 0.5);
 }
+.nav:nth-child(4) {
+  border-right: 1rpx solid rgba($color: #a0a0a0, $alpha: 0.5);
+}
 .nav-active {
   color: #1f1f1f;
 }
 .sort_box {
-  position: sticky;
+  // position: sticky;
   position: -webkit-sticky;
-  top: 160rpx;
+  top: 110rpx;
+  z-index: 999;
+  left: 0;
   overflow: scroll;
   flex-wrap: nowrap;
   padding: 16rpx 0;

src/pages/sign/index.vue

@@ -47,87 +47,67 @@
         </view> -->
         <!-- 天天捡漏等活动区-end -->
         <!-- 活动 -->
-        <view class="activity" v-if="activityList.length">
-                <image class="act_img act_one_img" :src="activityList[0].image" @click="toPage(activityList[0].url)" mode=""></image>
+        <view class="activity flex_r flex_ac flex_jb" v-if="activityList.length">
+                <!-- <image class="act_img act_one_img" :src="activityList[0].image" @click="toPage(activityList[0].url)" mode=""></image> -->
                 <view class="act_other">
-                    <image class="act_img act_two_img" :src="activityList[1].image" mode="" @click="toPage(activityList[1].url)"></image>
+                    <image class="act_img act_two_img" :src="activityList[0].image" mode="" @click="toPage(activityList[0].url)"></image>
                     <image class="act_img act_two_img" :src="activityList[2].image" @click="toPage(activityList[2].url)" mode=""></image>
                 </view>
+                <view class="act_other">
+                    <image class="act_img act_two_img" :src="activityList[1].image" mode="" @click="toPage(activityList[1].url)"></image>
+                    <image class="act_img act_two_img" :src="activityList[3].image" @click="toPage(activityList[3].url)" mode=""></image>
+                </view>
             </view>
             <!-- 活动-end -->
         <!-- 精品推荐 -->
         <view class="bou_head flex_r flex_ac flex_jc">
             <image class="bou_img" src="/static/sgin/left.png" mode=""></image>
-            <view class="bou_title">享好物</view>
+            <view class="bou_title">本地生活</view>
             <image class="bou_img" src="/static/sgin/right.png" mode=""></image>
         </view>
-        <view class="product-list">
-          <view
-            class="product"
-            v-for="(i, s) in goods"
-            :key="s"
-            @click="NavToGoodsDetail(i.id)"
-          >
-            <view class="image-view">
-              <image class="product-image" :src="i.goods.original_img"></image>
-            </view>
-            <view class="content-view">
-              <view :class="['product-title', 'ellipsis2']">{{
-                i.goods_name
-              }}</view>
-              <view class="product-price">
-                <text class="product-price-original">{{ i.cost_price }}</text>
-                <text class="product-text" v-if="['3', '4'].includes(type)"
-                  >赠<text class="corFE2C15">{{ i.give_cha_bao }}</text
-                  >贡献值</text
-                >
-              </view>
-              <view class="product-txt" v-if="type == 4">
-                <text class="product-price-favour">￥{{ i.market_price }}</text>
-                <text class="product-text">消费券抵</text>
-                <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
-              </view>
-              <!-- <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
-              <view class="product-txt" v-if="type == 6"
-                >每<text class="green">{{ i.interval_time }}</text> 分钟降价
-                <text class="green">{{ i.drop_range * 100 }}%</text>
-              </view>
-              <view class="product-txt" v-if="['3'].includes(type)"
-                >限时赠送<text class="corFE2C15">{{ i.teac }}</text
-                >TeaC</view
-              >
-              <view class="product-txt fenxiang" v-if="['3'].includes(type)">
-                <text class="iconfont red">&#xe62b;</text>
-                <text class="red"
-                  >分享约获得{{ i.first_teac
-                  }}{{ type == 3 ? "TeaC" : "现金" }}</text
-                >
-              </view>
-              <view v-if="['4'].includes(type)" class="flex_r flex_ac">
-                <view class="product-txt"
-                  >赠<text class="corFE2C15">{{ i.teac }}</text
-                  >TeaC</view
-                >
-                <!-- <view class="product-txt fenxiang" style="background-color: rgba(0, 0, 0, 0);">
-                  <text class="iconfont red">&#xe62b;</text>
-                  <text class="red"
-                    >{{ i.first_teac }}</text
-                  >
-                </view> -->
-              </view>
-            </view>
-          </view>
-        </view>
+        <div class="l_tabBar flex_r flex_jb">
+            <div class="search-box flex_r flex_jb flex_ac">
+                <div class="district" @click="showAddress = !showAddress">
+                    <span>{{ LocationCity }}</span>
+                    <span class="iconfont">&#xe62f;</span>
+                </div>
+                <div class="search flex_r flex_jb flex_ac">
+                    <span class="iconfont">&#xe661;</span>
+                    <input v-model="searchKey" @confirm="toSearch" class="inp" placeholder="搜索你要的内容">
+                    <span class="search_btn" @click="toSearch">搜索</span>
+                </div>
+                <!-- <div class="scan-ico iconfont">&#xe8cf;</div> -->
+            </div>
+        </div>
+        <div class="list" v-if="list.length">
+            <div class="li_item" v-for="(i,s) in list" :key="s" @click="goMerchant(i)">
+                <div class="logo_img">
+                    <img :src="i.logo" alt="">
+                </div>
+                <div class="con_box">
+                    <div class="p1 ellipsis"><span class="topicon" v-if="i.is_recom == 1">⭐️</span>{{ i.name }}</div>
+                    <div class="p2">{{ i.address }}</div>
+                    <div class="p3">{{ $h.Div(i.distance, 1000).toFixed(2) }} km</div>
+                </div>
+            </div>
+        </div>
+        <not-goods v-else textStr="暂无附近商家"></not-goods>
+        <!-- 城市选择 -->
+         <h-address @select="selectaddress" :visible.sync="showAddress" />
         <!-- 精品推荐-end -->
         <view class="fz_w_text">好生活，茶付宝！</view>
+        <bottom-nav :currentIndex="1"></bottom-nav>
     </div>
 </template>
 <script>
 let page = 1;
 let rewardedVideoAd = null; //签到广告
 import { post } from "@/request/api.js";
+import bottomNav from "@/components/bottom-nav/index.vue";
+import hAddress from "@/components/h-address/address.vue"; //城市选择
+import notGoods from "@/components/not-goods/index.vue";
 export default {
-    components: {},
+    components: {bottomNav,hAddress,notGoods},
     data() {
         return {
             integerInfo: {}, // 积分详情
@@ -150,6 +130,19 @@ export default {
             activityList:[], // 活动横幅区
             type: 4,
             categoryId: 11,
+            searchKey: "", //搜索关键词
+            LocationCity: "中国",
+            showAddress: false,
+            list: [],
+            Query: {
+                latitude: "",
+                longitude: "",
+                page: 1,
+                rows: 20,
+                city: "",
+                business: -1
+            },
+            pageData: {},
         };
     },
     async onShow() {
@@ -161,9 +154,13 @@ export default {
         this.goods = [];
         this.userinfo = uni.getStorageSync("userinfo");
         this.loadData();
-        this.goodsDay();
+        // this.goodsDay();
         this.getActivityList();
         this.localInfo = await uni.Luserfun()
+                this.Query.page = 1
+        this.pageData  = {}
+        this.list = []
+        this.getList(); //商家列表
     },
     onLoad(da) {
         uni.setTabBarStyle({
@@ -240,7 +237,7 @@ export default {
         },
         // 横幅活动
         getActivityList() {
-            post("v1/goods/simple", {isWx: 1}).then((res) => {
+            post("v1/goods/simple", {isWx: 0}).then((res) => {
                 if (res.code === 0) {
                     this.activityList = res.data.data
                 } else {
@@ -271,51 +268,46 @@ export default {
                     return ""
             }
         },
-        // 获取消费券电商
-        goodsDay() {
-            let that = this;
-            let data = { page, type: 4, category_id: 11 };
-            post("v1/goods/categoryInfo", data).then((res) => {
-                if (res.code === 0) {
-                    let obj = res.data.data.data;
-                    if (page <= 1) that.goods = [];
-                    if (obj.length > 0) {
-                        obj.forEach((e) => {
-                            that.goods.push(e);
-                        });
-                    } else {
-                        if (page == 1) {
-                            that.haveGoods = true;
-                            page = -1;
-                        } else {
-                            page = -1;
-                            this.$toast("暂无更多");
-                        }
-                    }
-                } else {
-                    if (page == 1) {
-                        that.haveGoods = true;
-                        page = -1;
-                    } else {
-                        page = -1;
-                        this.$toast("暂无更多");
-                    }
-                }
-            });
-        },
+        
         // 跳转到商品详情页
         NavToGoodsDetail(id, type) {
             this.goto("/pages/product/p_details", { id, type: this.type });
         },
+        // 搜索
+        toSearch() {
+            this.goto("/pagesC/settledMerchant/index", { key: this.searchKey });
+        },
+        goMerchant(da) {
+            this.setLS("merchant", da)
+            this.goto("/pagesC/settledMerchant/merchant", { id: da.id })
+        },
+        async getList(page) {
+            let { lat, lng } = await uni.Location();
+            this.Query.latitude = lat;
+            this.Query.longitude = lng;
+            if (page) {
+                this.list = []
+                this.Query.page = 1
+            }
+            post("v1/merchant/list", this.Query).then(res => {
+                if (res.code == 0) {
+                    let da = res.data.data
+                    delete res.data.data
+                    this.pageData = res.data
+                    this.list = [...this.list, ...da]
+                    this.Query.page++
+                }
+            })
+        },
+        // 选择城市
+        selectaddress(da) {
+            this.LocationCity = da.cityName;
+            this.showAddress = false;
+        },
     },
     //页面上拉触底事件的处理函数
     onReachBottom() {
-        if (page != -1) {
-            setTimeout(() => {
-                ++page;
-                this.goodsDay();
-            }, 500);
-        }
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>
@@ -324,7 +316,9 @@ export default {
 page {
     background: #f5f5f5;
 }
-
+.container {
+  padding-bottom: 220rpx;
+}
 .head {
     padding: 30rpx;
 }
@@ -533,7 +527,7 @@ page {
         font-size: 36rpx;
         color: #121212;
         font-weight: bold;
-        margin: 0 36rpx;
+        margin: 0 26rpx;
     }
 }
 
@@ -650,7 +644,7 @@ page {
 
     .act_other {
         display: inline-block;
-        width: calc(100% - 300rpx - 10rpx);
+        width: 49.5%;
     }
 
     .act_two_img {
@@ -664,4 +658,131 @@ page {
 }
 
 // 活动-end
+.l_tabBar {
+    // margin: 32rpx 0 20rpx;
+    padding: 10rpx 20rpx;
+    border-radius: 10rpx;
+    flex-wrap: wrap;
+
+    .search-box {
+        width: 100%;
+        padding: 10rpx;
+        margin-bottom: 12rpx;
+
+        .district {
+            font-size: 32rpx;
+            font-weight: 600;
+            color: #333;
+
+            .iconfont {
+                font-size: 20rpx;
+                margin-left: 12rpx;
+            }
+        }
+
+        .search {
+            border: 1px solid #D78C2E;
+            height: 60rpx;
+            line-height: 60rpx;
+            padding-left: 20rpx;
+            border-radius: 31rpx;
+
+            .iconfont {
+                font-size: 30rpx;
+            }
+
+            .inp {
+                font-size: 25rpx;
+                padding: 0 8rpx;
+                width: 360rpx;
+            }
+
+            .search_btn {
+                background-color: #D78C2E;
+                height: 100%;
+                color: #fff;
+                border-radius: 31rpx;
+                font-size: 28rpx;
+                padding: 0 28rpx;
+            }
+        }
+
+        .scan-ico {
+            font-size: 55rpx;
+        }
+    }
+
+    .item {
+        width: 105rpx;
+        margin: 10rpx 10rpx;
+    }
+
+    .ico {
+        width: 100%;
+        height: 138rpx;
+    }
+
+    // .tit{
+    //   font-size: 26rpx;
+    //   text-align: center;
+    // }
+}
+
+.list {
+    padding: 0rpx 30rpx 30rpx;
+
+    .li_item {
+        margin-bottom: 20rpx;
+        padding: 28rpx 32rpx;
+        background-color: #fff;
+        border-radius: 10rpx;
+        box-shadow: 4rpx 4rpx 8rpx 4rpx rgba(0, 0, 0, 0.12);
+    }
+
+    .li_title {
+        font-size: 36rpx;
+        margin-bottom: 16rpx;
+    }
+
+    .logo_img,
+    .con_box {
+        display: inline-block;
+        vertical-align: top;
+    }
+
+    .logo_img {
+        img {
+            height: 180rpx;
+            width: 180rpx;
+            border-radius: 10rpx;
+        }
+    }
+
+    .con_box {
+        height: 180rpx;
+        width: calc(100% - 180rpx - 28rpx);
+        margin-left: 28rpx;
+        position: relative;
+
+        .p1 {
+            font-size: 32rpx;
+            font-weight: bold;
+            color: #333;
+            margin-bottom: 6rpx;
+        }
+
+        .p2 {
+            font-size: 24rpx;
+            color: #999;
+        }
+
+        .p3 {
+            font-size: 24rpx;
+            color: #666;
+            position: absolute;
+            right: 0;
+            bottom: 0;
+        }
+    }
+}
 </style>

src/pages/speed-up/index.vue

@@ -67,9 +67,9 @@
 <script>
 let tim
 import { post } from "@/request/api.js";
-import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
+// import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 	export default {
-		components: {cmdProgress},
+		// components: {cmdProgress},
 		data() {
 			return {
 				pro_num:0,

src/pages/szw-order-list/index.vue

@@ -56,12 +56,12 @@ var app = getApp();
 import { ToPayOpre } from "@/utils/reqTools.js";
 var toPayOpre = new ToPayOpre();
 import notGoods from "@/components/not-goods/index";
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 import { post } from "@/request/api.js";
 export default {
     components: {
         notGoods,
-        authorizeModule
+        // authorizeModule
     },
     data() {
         return {

src/pagesC/settledMerchant/merchant.vue

@@ -45,12 +45,12 @@
 let app = getApp();
 import preview from "@/components/swiper-preview/index";
 import navcustom from "@/components/navigationCustom/navigation-custom.vue"
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 import { post } from "@/request/api.js";
 export default {
     name: "hotel",
     props: {},
-    components: { preview, navcustom, authorizeModule },
+    components: { preview, navcustom,  },
     data() {
         return {
             query: {},

src/pagesC/shoppingMallType/order/list.vue

@@ -103,13 +103,13 @@
 var page = 1;
 var app = getApp();
 import notGoods from "@/components/not-goods/index";
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 import { post } from "@/request/api.js";
 import uniCopy from "@/utils/copy";
 export default {
   components: {
     notGoods,
-    authorizeModule,
+    // authorizeModule,
   },
   data() {
     return {

src/pagesC/shoppingMallType/p_details.vue

@@ -234,7 +234,7 @@ import mpHtml from "@/uni_modules/mp-html/components/mp-html/mp-html.vue";
 import swiperBanner from "@/components/swiperBanner/index.vue";
 import uniGoodsNav from "@/components/uni-goods-nav/uni-goods-nav.vue";
 import uniNumberBox from "@/components/uni-number-box/uni-number-box.vue";
-import authorizeModule from "@/components/authorize-module/index";
+// import authorizeModule from "@/components/authorize-module/index";
 import uniCopy from "@/utils/copy";
 export default {
   components: {
@@ -242,7 +242,7 @@ export default {
     uniGoodsNav,
     swiperBanner,
     uniNumberBox,
-    authorizeModule,
+    // authorizeModule,
   },
   data() {
     return {