Browse Source

1.将首页茶宝兑换改成缴电费(不开放)
2.将首页数智云城换成茶宝兑换
3.我的页面节点轮播

2662043119@qq.com 1 year ago
parent
commit
eac1762ce1
6 changed files with 77 additions and 12 deletions
  1. 16 0
      .hbuilderx/launch.json
  2. 7 1
      package.json
  3. 1 1
      src/pages/index/index.vue
  4. 48 5
      src/pages/my/index.vue
  5. 2 2
      src/request/config.js
  6. 3 3
      src/static/js/tabs.js

+ 16 - 0
.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

+ 7 - 1
package.json

@@ -66,14 +66,20 @@
     "@dcloudio/uni-stat": "2.0.2-3080720230703001",
     "@dcloudio/uni-ui": "^1.4.28",
     "@vue/shared": "3.3.4",
+    "cache-loader": "^4.1.0",
     "core-js": "^3.6.5",
     "dayjs": "^1.11.6",
+    "file-loader": "^6.2.0",
     "flyio": "0.6.14",
+    "html-webpack-plugin": "^5.6.0",
     "js-md5": "^0.7.3",
     "regenerator-runtime": "^0.12.1",
+    "thread-loader": "^4.0.2",
     "uqrcodejs": "^4.0.6",
+    "url-loader": "^4.1.1",
     "vue": "^2.6.11",
-    "vuex": "3.6.2"
+    "vuex": "3.6.2",
+    "webpack": "^4.47.0"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",

+ 1 - 1
src/pages/index/index.vue

@@ -42,7 +42,7 @@
             <view class="activity" v-if="homeImg.length">
                 <image class="act_img act_one_img" :src="homeImg[0].image" @click="setPageUrl({ type: 4 })" mode=""></image>
                 <view class="act_other">
-                    <image class="act_img act_two_img" :src="homeImg[1].image" @click="goto('/pagesB/specialregion/index')" mode=""></image>
+                    <image class="act_img act_two_img" :src="homeImg[1].image" @click="goto('/pages/product/productTeaBaby?type=5')" mode=""></image>
                     <image class="act_img act_two_img" :src="homeImg[2].image" mode="" @click="goVipGift"></image>
                 </view>
             </view>

+ 48 - 5
src/pages/my/index.vue

@@ -41,14 +41,29 @@
             </view>
             <!-- 用户信息-end -->
             <!-- 节点 -->
-            <view class="regional" v-if="localInfo.regional">
+            <view class="regional flex_r" v-if="localInfo.regional.length > 0">
                 <img src="@/static/my/regional.png" alt="" srcset="" class="ico">
-                <span class="txtinfo">区域服务节点:{{ localInfo.regional }}</span>
+                <view class="flex_r flex_ac">
+                    <span class="txtinfo">区域服务节点:</span>
+                    <swiper class="notice_swiper" vertical autoplay circular :interval="2000" :duration="1000">
+                        <swiper-item v-for="(iitem, iindex) in localInfo.regional" :key="iindex" @click="toDetail(item.article_id)">
+                            <span class="not_list">{{ iitem }}</span>
+                        </swiper-item>
+                    </swiper>
+                </view>
             </view>
-            <view class="regional top10" v-if="localInfo.operate">
+            <view class="regional flex_r flex_ac" v-if="localInfo.operate.length > 0">
                 <img src="@/static/my/regional.png" alt="" srcset="" class="ico">
-                <span class="txtinfo">区域运营节点:{{ localInfo.operate }}</span>
+                <view class="flex_r flex_ac">
+                    <span class="txtinfo">区域运营节点:</span>
+                    <swiper class="notice_swiper" vertical autoplay circular :interval="2000" :duration="1000">
+                        <swiper-item v-for="(iitem, iindex) in localInfo.operate" :key="iindex" @click="toDetail(item.article_id)">
+                            <span class="not_list">{{ iitem }}</span>
+                        </swiper-item>
+                    </swiper>
+                </view>
             </view>
+            
             <!-- 节点-end -->
             <!-- 账户信息 -->
             <view class="acc_info flex_r flex_jse">
@@ -219,7 +234,10 @@ export default {
             unid: "",
             invited: "",
             isAuthentication: uni.getStorageSync("isAuthentication"), //是否开启实名模块
-            localInfo: {}, //数智生活信息
+            localInfo: {
+                regional:[],
+                operate:[]
+            }, //数智生活信息
             merchantSetlet: {},
             isBusinessCenter: false,
         };
@@ -507,6 +525,7 @@ page {
     .txtinfo {
         color: #000;
         font-size: 25rpx;
+        white-space: nowrap;
     }
 
     .ico,
@@ -664,4 +683,28 @@ page {
 }
 
 // 功能列表-end
+
+.notice_swiper {
+    height: 40rpx;
+    // padding-left: 20rpx;
+    font-size: 28rpx;
+    float: left;
+    box-sizing: border-box;
+    min-width: 430rpx;
+    .not_list {
+        min-width: 430rpx;
+    }
+    .not_ico {
+        width: 30rpx;
+        font-size: 28rpx;
+        color: #999;
+    }
+    .not_list,
+    .not_ico {
+        display: inline-block;
+        vertical-align: middle;
+        height: 40rpx;
+        line-height: 40rpx;
+    }
+}
 </style>

+ 2 - 2
src/request/config.js

@@ -15,6 +15,6 @@ if (process.env.UNI_PLATFORM === "h5") {
 export default apis == 1 ? {
 	Hhost: "https://shop-api.haocha13.cn/",
 } : {
-	// Hhost: "https://shop-api.haocha13.cn/",  //正式接口
-	Hhost: "https://test-api.haocha13.cn/",
+	Hhost: "https://shop-api.haocha13.cn/",  //正式接口
+	// Hhost: "https://test-api.haocha13.cn/",
 }

+ 3 - 3
src/static/js/tabs.js

@@ -45,9 +45,9 @@ export default [
       tit: "景区景点"
   },
   {
-      ico: "http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/c8ab4bdc39dc35a64b00b5ed789e04622635b863png",
-      url: "/pages/product/productTeaBaby?type=5",
-      tit: "茶宝兑换"
+      ico: "http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/ds2fc5d41e53863bebe8d669f8c27d7cas1sd1png",
+      url: "",
+      tit: "缴电费"
   },
 //   {
 //       ico: "http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/26e490aca87654a65d5e1a8b4bb2702e6f835ef6png",