Browse Source

app不参与此次修改

xiaomei 1 year ago
parent
commit
3f84cda27b

+ 13 - 7
src/pages.json

@@ -434,7 +434,7 @@
 				{
 					"path": "my/myWallet",
 					"style": {
-						"navigationBarTitleText": "我的财富"
+						"navigationBarTitleText": "我的积分"
 					}
 				},
 				{
@@ -505,6 +505,12 @@
 						"enablePullDownRefresh": false,
 						"disableScroll": true
 					}
+				},
+				{
+					"path": "my/webView",
+					"style": {
+						"navigationBarTitleText": "APP下载"
+					}
 				}
 			]
 		},
@@ -647,12 +653,12 @@
 				"selectedIconPath": "static/nav/local.png",
 				"text": "消费金电商"
 			},
-			{
-				"pagePath": "pages/sign/index",
-				"iconPath": "static/nav/benefits_.png",
-				"selectedIconPath": "static/nav/benefits.png",
-				"text": "福利"
-			},
+			// {
+			// 	"pagePath": "pages/sign/index",
+			// 	"iconPath": "static/nav/benefits_.png",
+			// 	"selectedIconPath": "static/nav/benefits.png",
+			// 	"text": "福利"
+			// },
 			{
 				"pagePath": "pages/my/index",
 				"iconPath": "static/nav/my_.png",

+ 39 - 15
src/pages/my/index.vue

@@ -83,11 +83,11 @@
                             <image src="/static/wallet/3.png" class="ico" /><span>消费金</span></p>
                         <p class="dinB tc">{{localInfo.integral||0}}</p>
                     </div>
-                    <div class="i_num flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">
+                    <!-- <div class="i_num flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">
                         <p class="flex_r flex_ac flex_jc">
                             <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
                         <p class="dinB tc">{{userinfo.cha_bao||0}}</p>
-                    </div>
+                    </div> -->
                 <!-- </div> -->
                 <!-- <div class="flex_c flex_jse">
                     <div class="i_num flex_c flex_ae" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
@@ -129,17 +129,9 @@
         </view>
         <!-- 功能列表 -->
         <view class="fun_container">
-            <view class="fun mar_t30">
+            <!-- <view class="fun mar_t30">
                 <view class="fun_title">数智生活</view>
                 <view class="fun_con mar_t50 flex_r flex_ac">
-                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/myWallet" hover-class="none">
-                        <image class="fun_img" src="/static/my/9.png"></image>
-                        <view class="fun_text">我的财富</view>
-                    </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/orderlist" hover-class="none">
-                        <image class="fun_img" src="/static/my/10.png"></image>
-                        <view class="fun_text">历史订单</view>
-                    </navigator>
                     <navigator class="fun_list flex_c flex_ac" @click="activation" hover-class="none">
                         <image class="fun_img" src="/static/my/11.png"></image>
                         <view class="fun_text">激活升级</view>
@@ -153,8 +145,8 @@
                         <view class="fun_text">赠送</view>
                     </navigator>
                 </view>
-            </view>
-            <view class="fun mar_t30">
+            </view> -->
+            <!-- <view class="fun mar_t30">
                 <view class="fun_title flex_r flex_ac flex_jb">
                     <view>云店订单</view>
                     <view class="moarbtn" @click="goto('/pages/szw-order-list/index')">
@@ -184,7 +176,7 @@
                         <view class="fun_text">已完成</view>
                     </navigator>
                 </view>
-            </view>
+            </view> -->
             <view class="fun mar_t30" v-if="isBusinessCenter">
                 <view class="fun_title">商家中心</view>
                 <view class="fun_con mar_t50 flex_r flex_ac">
@@ -212,6 +204,24 @@
             </view>
             <view class="fun mar_t30">
                 <view class="fun_title">我的服务</view>
+                <view class="fun_con mar_t50 flex_r flex_ac">
+                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/myWallet" hover-class="none">
+                        <image class="fun_img" src="/static/my/9.png"></image>
+                        <view class="fun_text">我的积分</view>
+                    </navigator>
+                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/orderlist" hover-class="none">
+                        <image class="fun_img" src="/static/my/10.png"></image>
+                        <view class="fun_text">本地订单</view>
+                    </navigator>
+                    <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index" hover-class="none">
+                        <image class="fun_img" src="/static/my/15.png"></image>
+                        <view class="fun_text">电商订单</view>
+                    </navigator>
+                    <navigator class="fun_list flex_c flex_ac" @click="copy" hover-class="none">
+                        <image class="fun_img" src="/static/my/14.png"></image>
+                        <view class="fun_text">APP下载</view>
+                    </navigator>
+                </view>
                 <view class="fun_con mar_t50 flex_r flex_ac">
                     <navigator class="fun_list flex_c flex_ac" url="/pagesB/address/list" hover-class="none">
                         <image class="fun_img" src="/static/my/dizhi.png"></image>
@@ -404,6 +414,20 @@ export default {
                 error: (e) => {},
             });
         },
+        copy(){
+            this.$toast("敬请期待")
+            // uniCopy({
+            //     content: "https://a.app.qq.com/o/simple.jsp?pkgname=com.chafubao.mm",
+            //     success: (res) => {
+            //         uni.showToast({
+            //             title: "APP下载链接已复制成功,请转到浏览器下载",
+            //             icon: "none",
+            //             duration: 1000,
+            //         });
+            //     },
+            //     error: (e) => {},
+            // });
+        },
         // 点击头像
         upheadimg() {
             let that = this;
@@ -642,7 +666,7 @@ page {
     .i_num {
         text-align: center;
         font-size: 32rpx;
-        width: 33%;
+        width: 50%;
 
         p {
             color: #BE7329;

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

@@ -76,7 +76,7 @@ export default {
             let adres = await uni.Location();
             this.Query.latitude = adres.lat;
             this.Query.longitude = adres.lng;
-            this.getList();
+            // this.getList();
         },
         getTabs() {
             post("v1/merchant/business", {}).then(res => {

+ 16 - 6
src/pagesB/my/myWallet.vue

@@ -2,7 +2,7 @@
     <div class="myWallet">
         <div class="acc_info">
             <view class="flex_r flex_jb acc_row">
-                <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
+                <!-- <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/3.png" class="ico" /><span>消费金</span></p>
                     <p class="dinB">{{localInfo.integral}}</p>
@@ -11,29 +11,39 @@
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/4.png" class="ico" /><span>我的余额</span></p>
                     <p class="dinB">{{localInfo.property}}</p>
-                </div>
+                </div> -->
                 <div class="i_num" @click="goto('/pages/accountDetails/teaBaby')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
                     <p class="dinB">{{userinfo.cha_bao}}</p>
                 </div>
+                <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/8.png" class="ico" /><span>TeaC {{ teacCountCny }}</span></p>
+                    <p class="dinB">{{userinfo.teac}}</p>
+                </div>
+                <div class="i_num" @click="goto('/pagesB/accountDetails/OriginalShares')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/5.png" class="ico" /><span>OE {{ equityCountCny }}</span></p>
+                    <p class="dinB">{{localInfo.original_equity || 0}}</p>
+                </div>
             </view>
             <view class="flex_r flex_jb">
-                <div class="i_num" @click="goto('/pagesB/accountDetails/OriginalShares')">
+                <!-- <div class="i_num" @click="goto('/pagesB/accountDetails/OriginalShares')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/5.png" class="ico" /><span>OE {{ equityCountCny }}</span></p>
                     <p class="dinB">{{localInfo.original_equity || 0}}</p>
                 </div>
-                <!-- <div class="i_num" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
+                <div class="i_num" @click="goto('/pagesC/settledMerchant/balanceLog',{s:0})">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/11.png" class="ico" /><span>商户余额</span></p>
                     <p class="dinB">{{localInfo.merchant_money || 0}}</p>
-                </div> -->
+                </div>
                 <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="@/static/wallet/8.png" class="ico" /><span>TeaC {{ teacCountCny }}</span></p>
                     <p class="dinB">{{userinfo.teac}}</p>
-                </div>
+                </div> -->
             </view>
         </div>
     </div>

+ 9 - 3
src/pagesB/my/shuZhiWallet.vue

@@ -18,9 +18,9 @@
                 <span class="ico iconfont">&#xe603;</span>
                 <span class="btn_txt">提现</span>
             </div>
-            <div class="btn_item corc" @click="goto('/pagesB/topUp/Local')" :style="{'width':isMerchant?'210rpx':'280rpx'}">
-                <span class="ico iconfont">&#xe68a;</span>
-                <span class="btn_txt">充值</span>
+            <div class="btn_item corc"  :style="{'width':isMerchant?'210rpx':'280rpx'}">
+                <image class="icon ico1" src="@/static/my/16.png" mode="" />
+                <span class="btn_txt">消费券</span>
             </div>
             <!-- <div class="btn_item conv" v-if="isMerchant" @click="goto('/pagesC/convert/index')">
                 <image class="ico" src="@/static/icon/convert.png" mode="widthFix" />
@@ -182,6 +182,12 @@ import { post } from "@/request/api.js";
         justify-content: center;
         font-size: 36rpx;
     }
+    .ico1{
+        width: 40rpx;
+        height: 40rpx;
+        padding: 10rpx !important;
+        box-sizing: border-box;
+    }
     .btn_txt{
         height: 50rpx;
         width: calc(76% - 50rpx);

+ 20 - 0
src/pagesB/my/webView.vue

@@ -0,0 +1,20 @@
+<!-- pages/webView/webView.vue -->  
+<template>  
+    <view>  
+      <web-view :src="url"></web-view>  
+    </view>  
+  </template>  
+  
+  <script>  
+  export default {  
+    data() {  
+      return {  
+        url: ''  
+      };  
+    },  
+    onLoad(options) {  
+      this.url = "https://a.app.qq.com/o/simple.jsp?pkgname=com.chafubao.mm"; // 接收从其他页面传递过来的URL
+    }  
+  }  
+  </script>
+  

BIN
src/static/my/14.png


BIN
src/static/my/15.png


BIN
src/static/my/16.png