1.分享邀请码优化

src/pages/account/consignment.vue

@@ -114,10 +114,8 @@ import notGoods from '@/components/not-goods/index.vue'
 		},
 		onShareAppMessage() {
 			let userinfo = uni.getStorageSync('userinfo');
-			var path = '/pages/account/consignment?agentId=1';
-			if (userinfo.user_id) {
-				path = '/pages/account/consignment?agentId=' + userinfo.user_id;
-			}
+			var path = '/pages/account/consignment';
+			if (userinfo.invite) path = '/pages/account/consignment?invite=' + userinfo.invite;
 		    var title = `让数字经济赋能美好生活！`;
 		    return {
 		        title: title,

src/pages/index/index.vue

@@ -214,7 +214,8 @@ export default {
                     this.goto(url)
                     // uni.Luserfun()
                 } else if (res.code == -1) {
-                    this.activation();
+                    appEv.errTips("请先登录或注册！");
+                    // this.activation();
                 }
             })
         },
@@ -225,11 +226,11 @@ export default {
     },
     computed: {},
     watch: {},
-    onShareAppMessage: function() {
+    onShareAppMessage() {
         let userinfo = uni.getStorageSync("userinfo");
-        var path = "/pages/index/index?agentId=1";
-        if (userinfo.user_id) {
-            path = "/pages/index/index?agentId=" + userinfo.user_id;
+        var path = "/pages/index/index";
+        if (userinfo.invite) {
+            path = "/pages/index/index?invite=" + userinfo.invite;
         }
         var title = `让数字经济赋能美好生活！`;
         return {

src/pages/my/index.vue

@@ -4,7 +4,8 @@
             <!-- 用户信息 -->
             <view class="uerInfo mar_t16 flex_r">
                 <view class="user_img">
-                    <image @click="upheadimg" class="image" :src="userinfo.head_pic"></image>
+                    <image v-if="!userinfo.head_pic" class="image" src="@/static/my/head.png" @click="login"></image>
+                    <image v-else @click="upheadimg" class="image" :src="userinfo.head_pic"></image>
                     <view class="coupon_info flex_r flex_ac" @tap="goToAutonym" v-if="isShiMing">
                         完成实名认证，享受更多权益
                         <image src="/static/my/f_close.png" mode="widthFix" class="close_icon" @tap.stop="closeAuto" />
@@ -26,14 +27,14 @@
                         </view>
                     </view>
                     <view class="user_option flex_r flex_ac flex_je">
-                        <navigator class="flex_c flex_ac" @tap="getImgPage" hover-class="none">
+                        <navigator class="flex_c flex_ac" @tap="getImgPage" hover-class="none" v-if="localInfo.level_id>1">
                             <image class="fun_img" src="/static/my/f_img_code.png"></image>
                             <view class="fun_text">分享海报</view>
                         </navigator>
                     </view>
                 </block>
                 <block v-else>
-                    <view class="user_con flex_c flex_jb" @click="login">
+                    <view class="user_con flex_c flex_as flex_jc" @click="login">
                         <view class="user_name flex_r flex_ae ellipsis">点此处登录</view>
                     </view>
                 </block>
@@ -70,57 +71,28 @@
                 <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/my918/9.png"></image>
+                        <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/my918/10.png"></image>
+                        <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/my918/11.png"></image>
+                        <image class="fun_img" src="/static/my/11.png"></image>
                         <view class="fun_text">激活升级</view>
                     </navigator>
                     <navigator v-if="localInfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
-                        <image class="fun_img" src="/static/my918/12.png"></image>
+                        <image class="fun_img" src="/static/my/12.png"></image>
                         <view class="fun_text">我的用户</view>
                     </navigator>
                     <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
-                        <image class="fun_img" src="/static/my918/13.png"></image>
+                        <image class="fun_img" src="/static/my/13.png"></image>
                         <view class="fun_text">赠送</view>
                     </navigator>
                 </view>
             </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="/pages/account/wealth" hover-class="none">
-                        <image class="fun_img" src="/static/my/wealth.png"></image>
-                        <view class="fun_text">财富</view>
-                    </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/consignment" hover-class="none">
-                        <image class="fun_img" src="/static/my/consign.png"></image>
-                        <view class="fun_text">寄卖</view>
-                    </navigator>
-                </view> -->
-                <!-- <view class="fun_con mar_t50 flex_r flex_ac">
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" 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" @tap="getToCash" hover-class="none">
-                        <image class="fun_img" src="/static/my/13.png"></image>
-                        <view class="fun_text">提现</view>
-                    </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/running" hover-class="none">
-                        <image class="fun_img" src="/static/my/fund.png"></image>
-                        <view class="fun_text">云宝明细</view>
-                    </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/withdraw" hover-class="none">
-                        <image class="fun_img" src="/static/my/withdraw.png"></image>
-                        <view class="fun_text">提现明细</view>
-                    </navigator>
-                </view> -->
                 <view class="fun_title flex_r flex_ac flex_jb">
                     <view>云店订单</view>
                     <view class="moarbtn" @click="goto('/pages/szw-order-list/index')">
@@ -226,12 +198,8 @@ export default {
         };
     },
     onLoad(options) {
-        //推荐人ID
-        if (options.invite) {
-            app.globalData.agentId = options.invite;
-            this.invited = options.invite;
-            uni.setStorageSync("inviteCode", options.invite)
-        }
+        //推荐人邀请码|受邀码
+        this.invited = uni.getStorageSync("inviteCode") || "XHCYGNZM"
         this.closeAuto(); //关闭实名功能
     },
     onShow() {
@@ -239,7 +207,6 @@ export default {
         else {
             this.getuserInfo();
             this.getchayou(); //获取茶友
-            this.getLU(); //数智生活信息
         }
     },
     methods: {
@@ -297,7 +264,7 @@ export default {
                 else this.isShiMing = false;
                 this.userinfo = res;
             } else this.login();
-            this.getLU(); //数智生活信息
+            this.localInfo = await uni.Luserfun()
         },
         // 跳转到实名页面
         goToAutonym() {
@@ -379,24 +346,16 @@ export default {
                 }
             });
         },
-        async getLU() {
-            this.localInfo = await uni.Luserfun()
-        },
         activation() {
             this.$refs.activation.open()
         },
         typeto(va) {
             switch (va) {
-                case 1:
-                    return "VIP";
-                case 2:
-                    return "群主";
-                case 3:
-                    return "合伙人";
-                case 4:
-                    return "联合创始人";
-                case 5:
-                    return "联合发起人";
+                case 1: return "消费商";
+                case 2: return "推广大使";
+                case 3: return "合伙人";
+                case 4: return "联合创始人";
+                case 5: return "联合发起人";
                 default:
                     return ""
             }

src/pages/orderingfood/merchantlist.vue

@@ -114,8 +114,8 @@ export default {
         },
         typeto(va) {
             switch (va) {
-                case 1: return "VIP";
-                case 2: return "群主";
+                case 1: return "消费商";
+                case 2: return "推广大使";
                 case 3: return "合伙人";
                 case 4: return "联合创始人";
                 case 5: return "联合发起人";

src/pages/product/p_details.vue

@@ -11,20 +11,20 @@
                 <span v-if="Number(detail.cha_bao) != 0">{{ detail.cha_bao }}茶宝</span>
             </view>
             <view v-else class="price" :class="type == 2 ? 'samll' : ''">
-				<text class="p_favour" v-if="type == 1">￥{{ detail.total_amount }}</text>
-				<text class="p_favour" v-if="type == 2">￥{{ detail.trade_price }} + {{detail.trade_num}}批发券 + {{detail.treasure_price}}茶宝</text>
-				<text class="p_favour" v-if="type == 3">￥{{ detail.cost_price }}</text>
-				<text class="p_favour" v-if="type == 4">￥{{ $h.Sub(detail.cost_price,detail.consume) }}</text>
-				<text class="p_favour" v-if="type == 5">￥{{ detail.cost_price }} + {{ detail.treasure_price }}茶宝</text>
-				<template v-if="type == 6">
-					<text class="p_favour">￥{{ detail.cost_price }}</text>
-					<text class="un_p_favour">￥{{ detail.original_price }}</text>
-				</template>
-				<text class="p_trade" v-if="type == 1">（含服务费{{$h.Mul(detail.service,2)}}元）</text>
-				<text class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</text>
+                <text class="p_favour" v-if="type == 1">￥{{ detail.total_amount }}</text>
+                <text class="p_favour" v-if="type == 2">￥{{ detail.trade_price }} + {{detail.trade_num}}批发券 + {{detail.treasure_price}}茶宝</text>
+                <text class="p_favour" v-if="type == 3">￥{{ detail.cost_price }}</text>
+                <text class="p_favour" v-if="type == 4">￥{{ $h.Sub(detail.cost_price,detail.consume) }}</text>
+                <text class="p_favour" v-if="type == 5">￥{{ detail.cost_price }} + {{ detail.treasure_price }}茶宝</text>
+                <template v-if="type == 6">
+                    <text class="p_favour">￥{{ detail.cost_price }}</text>
+                    <text class="un_p_favour">￥{{ detail.original_price }}</text>
+                </template>
+                <text class="p_trade" v-if="type == 1">（含服务费{{$h.Mul(detail.service,2)}}元）</text>
+                <text class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</text>
                 <view v-if="type == 4">
-					<text class="un_p_favour un_p">{{ detail.cost_price }}</text>
-				    <text class="p_trade">消费金抵扣 {{detail.consume}}</text>
+                    <text class="un_p_favour un_p">{{ detail.cost_price }}</text>
+                    <text class="p_trade">消费金抵扣 {{detail.consume}}</text>
                 </view>
             </view>
             <view class="price_span flex_r flex_ac flex_je">
@@ -192,7 +192,7 @@ export default {
         this.goodsDa = e;
         this.loadData(e);
 
-        if (e.invite && !token) this.login(e.invite);
+        if (!token) this.login();
     },
     onShow: function() {},
     methods: {
@@ -236,7 +236,7 @@ export default {
             let da = {
                 ...this.goodsDa,
                 num: Number(this.buyNum),
-                is_sell: ['1','2'].includes(this.type) ? this.pfway : "0",
+                is_sell: ['1', '2'].includes(this.type) ? this.pfway : "0",
             };
             this.goto("/pages/to-pay-list/index", da);
         },
@@ -282,7 +282,7 @@ export default {
                 url: "/pages/pay-agreement/index?type=" + this.goodsDa.type,
             });
         },
-        SoHAuth(){
+        SoHAuth() {
             this.$refs.autho.onSoHAuth();
         },
         login(invite) {
@@ -292,8 +292,8 @@ export default {
                 success(res) {
                     if (res.code) {
                         post("v1/appletLogin", {
-                            invite,
                             code: res.code,
+                            invite: uni.getStorageSync("inviteCode") || "XHCYGNZM"
                         }).then((res) => {
                             if (res.code === 0) {
                                 if (res.data.token) {
@@ -327,22 +327,11 @@ export default {
             this.userinfo = await uni.userfun();
         },
     },
-    onShareAppMessage: function() {
+    onShareAppMessage() {
         let userinfo = uni.getStorageSync("userinfo");
-        var path =
-            "/pages/product/p_details?agentId=1" +
-            "&id=" +
-            this.goodsDa.id +
-            "&type=" +
-            this.goodsDa.type;
+        var path = "/pages/product/p_details?id=" + this.goodsDa.id + "&type=" + this.goodsDa.type;
         if (userinfo.invite) {
-            path =
-                "/pages/product/p_details?invite=" +
-                userinfo.invite +
-                "&id=" +
-                this.goodsDa.id +
-                "&type=" +
-                this.goodsDa.type;
+            path = "/pages/product/p_details?invite=" + userinfo.invite + "&id=" + this.goodsDa.id + "&type=" + this.goodsDa.type;
         }
         var title = `让数字经济赋能美好生活！`;
         return {
@@ -387,7 +376,7 @@ page {
 .price {
     color: #fff;
     margin-left: 20rpx;
-	width: 400rpx;
+    width: 400rpx;
 
     .p_favour {
         font-size: 36rpx;
@@ -396,8 +385,9 @@ page {
     .un_p_favour {
         font-size: 26rpx;
         text-decoration: line-through;
-		margin-left: 16rpx;
-        &.un_p{
+        margin-left: 16rpx;
+
+        &.un_p {
             margin-left: 0;
         }
     }
@@ -432,9 +422,9 @@ page {
 }
 
 .samll {
-	.p_favour{
-		font-size: 28rpx;
-	}
+    .p_favour {
+        font-size: 28rpx;
+    }
 }
 
 // 价格信息栏-end

src/pages/product/productRetail.vue

@@ -45,7 +45,7 @@ export default {
             type: '',
             goods: [], // 商品列表
             haveGoods: false, // 是否有商品
-            is_vip: undefined, //是否筛选“群主礼包”专区
+            is_vip: undefined, //是否筛选“推广大使礼包”专区
         };
     },
     onLoad(e) {
@@ -53,7 +53,7 @@ export default {
         this.title = this.tidyTpye(e.type);
         if(e.is_vip) {
             this.is_vip = e.is_vip;
-            this.title = "群主礼包";
+            this.title = "推广大使礼包";
         }
         uni.setNavigationBarTitle({
             title: this.title
@@ -105,12 +105,10 @@ export default {
             this.$refs.shopping.close()
         },
     },
-    onShareAppMessage: function() {
+    onShareAppMessage() {
         let userinfo = uni.getStorageSync('userinfo');
-        var path = '/pages/product/productRetail?agentId=1';
-        if (userinfo.user_id) {
-            path = '/pages/product/productRetail?agentId=' + userinfo.user_id;
-        }
+        var path = '/pages/product/productRetail';
+        if (userinfo.invite) path = '/pages/product/productRetail?invite=' + userinfo.invite;
         var title = `让数字经济赋能美好生活！`;
         return {
             title: title,

src/pages/product/productTeaBaby.vue

@@ -73,12 +73,10 @@ export default {
         },
     },
 
-    onShareAppMessage: function() {
+    onShareAppMessage() {
         let userinfo = uni.getStorageSync("userinfo");
-        var path = "/pages/product/productWholesale?agentId=1";
-        if (userinfo.user_id) {
-            path = "/pages/product/productWholesale?agentId=" + userinfo.user_id;
-        }
+        var path = "/pages/product/productWholesale";
+        if (userinfo.invite) path = "/pages/product/productWholesale?invite=" + userinfo.invite;
         var title = `让数字经济赋能美好生活！`;
         return {
             title: title,

src/pages/product/productWholesale.vue

@@ -69,12 +69,10 @@ export default {
         }
     },
 
-    onShareAppMessage: function() {
+    onShareAppMessage() {
         let userinfo = uni.getStorageSync('userinfo');
-        var path = '/pages/product/productWholesale?agentId=1';
-        if (userinfo.user_id) {
-            path = '/pages/product/productWholesale?agentId=' + userinfo.user_id;
-        }
+        var path = '/pages/product/productWholesale';
+        if (userinfo.invite) path = '/pages/product/productWholesale?invite=' + userinfo.invite;
         var title = `让数字经济赋能美好生活！`;
         return {
             title: title,

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

@@ -97,7 +97,7 @@ export default {
                     if (res.code) {
                         post("v1/appletLogin", {
                             code: res.code,
-                            invite: "XHCYGNZM",
+                            invite: uni.getStorageSync("inviteCode") || "XHCYGNZM",
                         }).then((res) => {
                             if (res.code === 0) {
                                 if (res.data.token) {

src/pagesB/orderingfood/activationcode.vue

@@ -49,8 +49,8 @@ export default {
             codes: [],
 
             tabs: [
-                { n: "VIP", i: 1, k: "vip_num" },
-                { n: "群主", i: 2, k: "lord_num" },
+                // { n: "消费商", i: 1, k: "vip_num" },
+                { n: "推广大使", i: 2, k: "lord_num" },
                 { n: "合伙人", i: 3, k: "helper_num" },
                 { n: "联合创始人", i: 4, k: "vice_num" },
             ],

src/utils/share.js

@@ -20,4 +20,7 @@ export default {
 			path: this.share.path,
 		}
 	},
+    onLoad(da){
+        if(da.invite) uni.setStorageSync("inviteCode", da.invite);
+    }
 }