xuhaolan 2 years ago
parent
commit
7278f3dd60
42 changed files with 470 additions and 333 deletions
  1. 12 2
      App.vue
  2. 7 0
      api/user.js
  3. 1 0
      main.js
  4. 13 12
      manifest.json
  5. 10 2
      pages/game/gameDetail.vue
  6. 4 4
      pages/money/pay.vue
  7. 22 18
      pages/money/wallet.vue
  8. 4 4
      pages/money/withdrawal.vue
  9. 12 0
      pages/public/login.vue
  10. 1 1
      pages/set/addressManage.vue
  11. 1 1
      pages/user/purpleJf.vue
  12. 2 2
      pages/user/shopJf.vue
  13. 134 86
      pages/user/team.vue
  14. 59 15
      pages/user/user.vue
  15. 8 0
      pages/user/whiteJf.vue
  16. BIN
      static/img/promotion-bg.png
  17. 9 3
      store/index.js
  18. BIN
      unpackage/cache/apk/__UNI__F0D4DD1_cm.apk
  19. 1 1
      unpackage/cache/apk/apkurl
  20. 0 0
      unpackage/cache/apk/cmManifestCache.json
  21. 20 0
      unpackage/cache/appleConfig.ini
  22. 3 0
      unpackage/cache/certdataios
  23. 11 0
      unpackage/cache/ipa/apple-app-site-association
  24. 0 0
      unpackage/cache/wgt/__UNI__F0D4DD1/app-config-service.js
  25. 0 0
      unpackage/cache/wgt/__UNI__F0D4DD1/app-service.js
  26. 0 0
      unpackage/cache/wgt/__UNI__F0D4DD1/app-view.js
  27. 0 0
      unpackage/cache/wgt/__UNI__F0D4DD1/manifest.json
  28. BIN
      unpackage/cache/wgt/__UNI__F0D4DD1/static/img/promotion-bg.png
  29. 0 0
      unpackage/dist/build/app-plus/app-config-service.js
  30. 0 0
      unpackage/dist/build/app-plus/app-service.js
  31. 0 0
      unpackage/dist/build/app-plus/app-view.js
  32. 0 0
      unpackage/dist/build/app-plus/manifest.json
  33. BIN
      unpackage/dist/build/app-plus/static/img/promotion-bg.png
  34. 0 0
      unpackage/dist/dev/app-plus/app-config-service.js
  35. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  36. 136 182
      unpackage/dist/dev/app-plus/app-view.js
  37. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  38. BIN
      unpackage/dist/dev/app-plus/static/img/promotion-bg.png
  39. BIN
      unpackage/release/apk/__UNI__F0D4DD1__20220527112107.apk
  40. BIN
      unpackage/release/apk/__UNI__F0D4DD1__20220530095153.apk
  41. BIN
      unpackage/release/apk/__UNI__F0D4DD1__20220530101612.apk
  42. BIN
      unpackage/release/apk/__UNI__F0D4DD1__20220530141937.apk

+ 12 - 2
App.vue

@@ -22,10 +22,12 @@ export default {
 	onLaunch: function(urlObj) {
 		let obj = this;
 		// 加载缓存中的用户信息
-		let userInfo = uni.getStorageSync('userInfo') || '';
+		let userInfo = uni.getStorageSync('userInfo');  
 		// 判断是否拥有用户信息
-		if (userInfo.uid) {
+		if (userInfo) {
 			//更新登陆状态
+			// obj.hasLogin = 
+			plus.navigator.closeSplashscreen()
 			uni.getStorage({
 				key: 'userInfo',
 				success: res => {
@@ -33,6 +35,14 @@ export default {
 					obj.login(res.data);
 				}
 			});
+		}else{
+			console.log('没有数据');
+			uni.reLaunch({
+				url:'/pages/public/login',
+				success: () => {
+					plus.navigator.closeSplashscreen()
+				}
+			})
 		}
 		// #ifdef H5
 		// 保存路由对象

+ 7 - 0
api/user.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+export function tuiguang(data){
+	return request({
+		url:'/api/dow',
+		method:'get',
+		data
+	})
+}
 
 //查看子点位
 export function lookSubpoints(data, id) {

+ 1 - 0
main.js

@@ -41,6 +41,7 @@ Vue.prototype.$api = {msg, prePage};
 App.mpType = 'app'
 
 const app = new Vue({
+	store,//store对象
     ...App
 })
 app.$mount()

+ 13 - 12
manifest.json

@@ -2,16 +2,16 @@
     "name" : "喜嗨购",
     "appid" : "__UNI__F0D4DD1",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
         "usingComponents" : true,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
+            "alwaysShowBeforeRender" : false,
             "waiting" : true,
-            "autoclose" : true,
+            "autoclose" : false,
             "delay" : 0
         },
         "modules" : {
@@ -39,7 +39,12 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com" ]
+                    }
+                }
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -48,18 +53,13 @@
                     "weixin" : {
                         "appid" : "wx7ecea7b3999ee88c",
                         "appsecret" : "9c9329c67378aec194c48f259afbda9e",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__F0D4DD1/"
                     }
                 },
                 "geolocation" : {},
                 "payment" : {
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
-                    },
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx7ecea7b3999ee88c",
-                        "UniversalLinks" : ""
                     }
                 },
                 "push" : {},
@@ -147,5 +147,6 @@
                 }
             }
         }
-    }
+    },
+    "_spaceID" : "f2ce8da9-3823-402a-bd21-675f08b3b09b"
 }

+ 10 - 2
pages/game/gameDetail.vue

@@ -9,7 +9,8 @@
 					  距离打怪
 					<span>{{state==0?'开始':'结束'}}</span>
 					仅剩
-					<span>{{hour.day}}</span>天<span>{{hour.hours}}</span>时<span>{{hour.minutes}}</span>分<span>{{hour.seconds}}</span>秒
+					<span v-if="state==0" ><span>{{kai.day}}</span>天<span>{{kai.hours}}</span>时<span>{{kai.minutes}}</span>分<span>{{kai.seconds}}</span>秒</span>
+				<span v-else><span>{{hour.day}}</span>天<span>{{hour.hours}}</span>时<span>{{hour.minutes}}</span>分<span>{{hour.seconds}}</span>秒</span>
 				</view>
 				<view class="yueyue" style="margin-left: 200rpx;" v-else>
 					已结束
@@ -42,7 +43,7 @@
 				名称:{{guaishouList.name}}&nbsp&nbsp&nbsp期数Id:{{guaishouList.stage}}
 			</view>
 			<view class="gl">
-				<image src="../../static/game/game08.png" mode=""></image>
+				<image src="../../static/game/game08.png" mode="" @click="dian"></image>
 
 			</view>
 		</view>
@@ -238,6 +239,7 @@
 		},
 		data() {
 			return {
+				kai:{},
 				state: 0, //活动状态
 				xuhaolan: 1690,
 				name: '',
@@ -348,6 +350,9 @@
 					// console.log(res, '率积分');
 				})
 			},
+			dian(){
+				this.$api.msg('敬请期待!')
+			},
 			getDetail() {
 				getGameDetail({
 					id: this.uid
@@ -385,6 +390,9 @@
 					obj.timer = setInterval(getShijian, 1000)
 
 					function getShijian() {
+						let kai = timeComputed(add_time * 1000)
+						obj.kai = kai
+						// console.log(obj.kai,'kai');
 						let da = timeComputed(endTime * 1000)
 						obj.hour = da
 						Object.values(obj.hour).forEach(e => {})

+ 4 - 4
pages/money/pay.vue

@@ -6,14 +6,14 @@
 		</view>
 		<view class="pay-type-list">
 			<!-- v-if="ispg == 'android'" -->
-			<view class="type-item b-b"  @click="changePayType(1)">
+			<!-- <view class="type-item b-b"  @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view>
+			</view> -->
 			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>
@@ -40,8 +40,8 @@ import { isIOS } from '@/utils/platform.js';
 export default {
 	data() {
 		return {
-			payType: 1, //支付类型
-			payName: 'weixin',
+			payType: 3, //支付类型
+			payName: 'yue',
 			orderInfo: {},
 			money: 0.0, //订单金额
 			now_money: 0.0, //余额

+ 22 - 18
pages/money/wallet.vue

@@ -46,7 +46,7 @@
 						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.title }}</text>
+									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -155,7 +155,7 @@ export default {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading') {
+			if (navItem.loadingType === 'loading' || navItem.loadingType == 'noMore') {
 				//防止重复加载
 				return;
 			}
@@ -175,25 +175,29 @@ export default {
 					
 					// obj.recharge = data.income;
 					// obj.orderStatusSum = data.expend;
-					if (data[0].list.length > 0) {
-						console.log(data[0].list,'data.list[0]');
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList,'navItem.orderList');
-						navItem.page++;
+					if(data.length > 0) {
+						if (data[0].list.length > 0) {
+							console.log(data[0].list,'data.list[0]');
+							navItem.orderList = navItem.orderList.concat(data[0].list);
+							console.log(navItem.orderList,'navItem.orderList');
+							navItem.page++;
+						}else {
+							navItem.loadingType = 'noMore';
+							console.log('还有税局2');
+						}
+						if (navItem.limit == data[0].list.length) {
+							console.log(navItem.limit == data[0].list.length,'还有税局');
+							//判断是否还有数据, 有改为 more, 没有改为noMore
+							navItem.loadingType = 'more';
+							
+						} else {
+							//判断是否还有数据, 有改为 more, 没有改为noMore
+							navItem.loadingType = 'noMore';
+						}
 					}else {
 						navItem.loadingType = 'noMore';
-						console.log('还有税局2');
 					}
-					if (navItem.limit == data[0].list.length) {
-						console.log(navItem.limit == data[0].list.length,'还有税局');
-						//判断是否还有数据, 有改为 more, 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据, 有改为 more, 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
+					
 					this.$set(navItem, 'loaded', true);
 				})
 				.catch(e => {

+ 4 - 4
pages/money/withdrawal.vue

@@ -48,7 +48,7 @@
 						</view>
 					</view>
 				</label>
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont">
 							<image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image>
@@ -66,7 +66,7 @@
 							<radio value="bank" color="#ff0060" :checked="type == 'bank'" />
 						</view>
 					</view>
-				</label>
+				</label> -->
 			</radio-group>
 		</view>
 		<!-- #endif -->
@@ -158,10 +158,10 @@
 			if (options.type) {
 				this.from = options.type
 				if (this.from == 'purple') {
-					this.showType = '积分'
+					this.showType = '阳光积分'
 				}
 				if (this.from == 'shop') {
-					this.showType = '商家积分'
+					this.showType = '喜嗨积分'
 				}
 			}
 			//加载提现信息

+ 12 - 0
pages/public/login.vue

@@ -142,6 +142,18 @@
 											uni.setStorageSync('token', e.data.token);
 											getUserInfo({}).then(e => {
 												obj.login();
+												console.log(e.data.phone,'phone');
+												if(e.data.phone==null){
+													uni.showModal({
+														title:"提示",
+														content:"尚未绑定手机号!请先绑定!",
+														success() {
+															uni.navigateTo({
+																url:'../set/phone'
+															})
+														}
+													})
+												}
 												// 保存返回用户数据
 												obj.setUserInfo(e.data);
 												//成功跳转首页

+ 1 - 1
pages/set/addressManage.vue

@@ -119,7 +119,7 @@ export default {
 				this.$api.msg('请填写收货人姓名');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(data.mobile)) {
 				this.$api.msg('请输入正确的手机号码');
 				return;
 			}

+ 1 - 1
pages/user/purpleJf.vue

@@ -22,7 +22,7 @@
 					<!-- 					易货券转账 -->
 				</view>
 				<view class="money-btn" @click="navto('/pages/money/withdrawal?type=purple')">
-					积分提现 >
+					阳光积分提现 >
 				</view>
 			</view>
 		</view>

+ 2 - 2
pages/user/shopJf.vue

@@ -25,9 +25,9 @@
 				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=xl')">
 					喜嗨积分转账
 				</view>
-				<!-- <view class="money-btn" @click="navto('/pages/money/withdrawal?type=shop')">
+				<view class="money-btn" @click="navto('/pages/money/withdrawal?type=shop')">
 					{{userInfo.is_merchant == 1? '提现 >': ''}}
-				</view> -->
+				</view>
 			</view>
 		</view>
 		<view class="info-box flex">

+ 134 - 86
pages/user/team.vue

@@ -14,44 +14,50 @@
 				<image src="../../static/img/promotion-bg.png" mode=""></image>
 			</view>
 			<view class="money-box">
-				<view class="money">{{ all }}</view>
+				<view class="money">{{ navList.count||0 }}</view>
 				<view>我的推广人数</view>
 			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" :style="{ height: maxheight }" scroll-y
-					@scrolltolower="loadData">
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box flex_item">
-							<view class="title-avatar">
-								<image :src="item.avatar"></image>
-							</view>
-							<view class="list_tpl">
-								<view class="title">
-									<view class="title-name clamp">{{ item.nickname }}</view>
-								</view>
-								<view class="time">
-									<text>{{ item.time }}</text>
-								</view>
-							</view>
-							<!-- <view class="money">
-								<text>{{ item.self_achievement == null ? '未购买' : item.self_achievement + '元' }}</text>
-							</view> -->
-						</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">参与人数</view>
+				<view class="info-num">{{navList.count||0}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计参与积分</view>
+				<view class="info-num">{{navList.user_price||0}}</view>
+			</view>
+		</view>
+		<view class="content-box" v-for="item in navList.user_list">
+			<view class="content-box-left">
+				<view class="left-img">
+					<image :src="item.avatar" mode=""></image>
+				</view>
+				<view class="right-title">
+					<view class="top">
+					{{item.nickname}}
+					</view>
+					<view class="bottom">
+						ID:{{item.uid}}
 					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
+				</view>
+			</view>
+			
+			<view class="content-box-right">
+				<view class="state">
+					{{item.zt==0?'间推':'直推'}}
+				</view>
+				<view class="box-right">
+					参与积分:<span>{{item.price}}</span>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 <script>
 	import {
-		myspread
+		myspread,tuiguang
 	} from '@/api/user.js';
 	import {
 		mapState,
@@ -105,62 +111,10 @@
 			},
 			//获取收入支出信息
 			async loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				myspread({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						console.log(data);
-						this.all = data.total;
-						if (data.list.length > 0) {
-							this.list = data.list;
-							navItem.orderList = navItem.orderList.concat(data.list);
-							navItem.page++;
-						}
-						this.$nextTick(function() {
-							if (navItem.limit == data.list.length) {
-								//判断是否还有数据, 有改为 more, 没有改为noMore
-								navItem.loadingType = 'more';
-								return;
-							} else {
-								//判断是否还有数据, 有改为 more, 没有改为noMore
-								navItem.loadingType = 'noMore';
-							}
-						});
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
+				tuiguang().then(res=>{
+					console.log(res,'data');
+					this.navList = res.data
+				})
 			},
 			// 点击返回 我的页面
 			toBack() {
@@ -178,6 +132,46 @@
 		height: 100%;
 	}
 
+	.info-box {
+		width: 670rpx;
+		height: 186rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: -100rpx auto 0;
+		position: relative;
+		z-index: 2;
+
+		.info-item {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 1;
+
+			.info-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #999999;
+			}
+
+			.info-num {
+				margin-top: 30rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #181818;
+			}
+		}
+
+		.shu {
+			width: 2rpx;
+			height: 74rpx;
+			background: #dcdfe6;
+		}
+	}
+
 	.status_bar {
 		height: var(--status-bar-height);
 		width: 100%;
@@ -382,4 +376,58 @@
 			background: #dddddd;
 		}
 	}
+
+	.content-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin:  30rpx;
+
+		.content-box-left {
+			display: flex;
+			
+			.left-img {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 50%;
+				overflow: hidden;
+				image {
+				width: 100%;
+				height: 100%;
+				}
+			}
+
+			.right-title {
+				margin-left: 15rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
+				
+				.top {
+					font-weight: 500;
+					font-size: 30rpx;
+					
+				}
+
+				.bottom {
+					color: #999999;
+				}
+
+			}
+		}
+
+		.content-box-right {
+			display: flex;
+			flex-direction: column;
+			width: 230rpx;
+			color: #999999;
+			.state{
+				color: red;
+			}
+			span{
+				color: red;
+				font-size: 28rpx;
+			}
+		}
+	}
 </style>

+ 59 - 15
pages/user/user.vue

@@ -12,14 +12,16 @@
 			</view>
 			<view class="user-center">
 				<view class="user-name clamp2">
-					{{userInfo.nickname || '游客'}}
+					{{userInfo.nickname || '游客'}}<span style="color: #FFD700; margin-left: 15rpx;"
+						v-if="userInfo.level!=0">V{{userInfo.level}}</span>
 				</view>
 				<view class="user-phone" v-if="userInfo.uid">
 					邀请码:{{userInfo.uid}}
 				</view>
-				<view class="user-phone" v-if="userInfo.uid" @click="navTo('/pages/user/wenpiao')">
+				<!-- <view class="user-phone" v-if="userInfo.uid" @click="navTo('/pages/user/wenpiao')">
 					文票:{{userInfo.paper_ticket || '0'}}
-				</view>
+				</view> -->
+
 			</view>
 			<view class="user-right" @click="navTo('/pages/set/userinfo')">
 				<image src="../../static/user/user-set.png" mode=""></image>
@@ -80,11 +82,28 @@
 						绿卡
 					</view>
 				</view>
+				<view class="info-item" @click="navTo('/pages/user/wenpiao')">
+					<view class="item-val">
+						{{userInfo.paper_ticket || '0'}}
+					</view>
+					<view class="item-tit">
+						文票
+					</view>
+				</view>
+				<view class="info-item" @click="navTo('/pages/money/wallet')">
+					<view class="item-val">
+						{{userInfo.now_money || '0'}}
+					</view>
+					<view class="item-tit">
+						余额
+					</view>
+				</view>
+
 			</view>
 		</view>
 		<image src="../../static/img/sq-rz.png" mode="widthFix"
-			style="width: 691rpx;display: block;margin:0rpx auto 20rpx;" @click="navTo('/pages/user/joinShop')"
-			v-if="userInfo && userInfo.is_merchant == 0">
+			style="width: 691rpx;display: block;margin:0rpx auto 20rpx;" @click="shenqing()"
+			v-if="userInfo && userInfo.is_enter !=2">
 		</image>
 		<!-- 订单 -->
 		<view class="item-box item-box-b">
@@ -151,7 +170,7 @@
 			</uni-list-item>
 			<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user04.png">
 			</uni-list-item>
-			
+
 		</uni-list>
 		<view class="btm" style="height: 44px;"></view>
 		<!-- 客服 -->
@@ -217,12 +236,10 @@
 			};
 		},
 		onShow() {
+
+			// this.bdPhone()
 			this.loadBaseData();
-			// 判断是否已经登录
-			if (this.hasLogin) {
-				this.loadBaseData();
-				this.getGreenList()
-			}
+
 		},
 		onReady() {
 			// 初始化获取页面宽度
@@ -244,9 +261,35 @@
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
 		methods: {
-			
+			//申请
+			shenqing() {
+				if (this.userInfo.is_enter == 1) {
+					this.$api.msg('审核中')
+				} else {
+					uni.navigateTo({
+						url: '/pages/user/joinShop'
+					})
+				}
+			},
+
+			//绑定手机号
+			bdPhone() {
+				console.log(this.userInfo, 'user');
+				if (this.userInfo.phone == '') {
+					uni.showModal({
+						title: "提示",
+						content: "尚未绑定手机号!请先绑定!",
+						success() {
+							uni.navigateTo({
+								url: '../set/phone'
+							})
+						}
+					})
+				}
+			},
+
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			
+
 			// 绿卡记录
 			getGreenList() {
 				greenList({
@@ -272,6 +315,7 @@
 								this.setOrderInfo(data);
 							})
 							.catch(e => {
+								this.getGreenList()
 								this.setOrderInfo({
 									complete_count: 0, //完成
 									received_count: 0, //待收货
@@ -802,7 +846,7 @@
 			padding: 0 30rpx;
 
 			.info-item {
-				width: 33%;
+				width: 25%;
 				height: 50%;
 				text-align: center;
 				display: flex;
@@ -827,7 +871,7 @@
 			overflow: hidden;
 			flex-shrink: 0;
 			border-radius: 50%;
-			
+
 			width: 143rpx;
 			height: 143rpx;
 

+ 8 - 0
pages/user/whiteJf.vue

@@ -422,7 +422,15 @@
 			line-height: 1.5;
 
 			.title-box {
+				width: 610rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
 				.title {
+					width: 610rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
 					font-size: $font-lg;
 					color: $font-color-base;
 				}

BIN
static/img/promotion-bg.png


+ 9 - 3
store/index.js

@@ -11,9 +11,7 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		baseURL: 'http://xhg.duolio.cn', //请求地址配置 
-		// baseURL:'http://lnpt.frp.liuniu946.com/',//请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录
@@ -23,6 +21,14 @@ const store = new Vuex.Store({
 		// #endif
 		latitude: '',
 		longitude: '',
+
+		//延长登录
+		forcedLogin: false, //是否需要强制登录
+		hasLogin: false,
+		userName: "",
+		userId: '',
+		token: '',
+		pointId: '',
 	},
 	mutations: {
 		//保存微信信息
@@ -46,4 +52,4 @@ const store = new Vuex.Store({
 	actions: {}
 })
 
-export default store
+export default store

BIN
unpackage/cache/apk/__UNI__F0D4DD1_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/277ef340-dbf9-11ec-a05c-d3690009dd81
+https://ide.dcloud.net.cn/build/download/7b38b160-dfe0-11ec-9e42-d9bdf07ce58d

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


+ 20 - 0
unpackage/cache/appleConfig.ini

@@ -0,0 +1,20 @@
+[appleAppid]
+appleAppid=io.dcloud.xhg
+
+[appstore]
+appstore=
+
+[iosStyle]
+iosStyle=
+
+[universalLinks]
+universalLinks=https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__F0D4DD1/
+spaceid=f2ce8da9-3823-402a-bd21-675f08b3b09b
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=

+ 3 - 0
unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=C:/Users/Administrator/Desktop/xhg.mobileprovision
+ioscertFile=C:/Users/Administrator/Desktop/证书.p12
+ioscertPassword=7IwuiYJfyRjKKTfhI7sjzw==

+ 11 - 0
unpackage/cache/ipa/apple-app-site-association

@@ -0,0 +1,11 @@
+{
+    "applinks" : {
+        "apps" : [],
+        "details" : [
+            {
+                "appID" : "8346YX59CJ.io.dcloud.xhg",
+                "paths" : [ "/uni-universallinks/__UNI__F0D4DD1" ]
+            }
+        ]
+    }
+}

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/manifest.json


BIN
unpackage/cache/wgt/__UNI__F0D4DD1/static/img/promotion-bg.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/dist/build/app-plus/static/img/promotion-bg.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 136 - 182
unpackage/dist/dev/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN
unpackage/dist/dev/app-plus/static/img/promotion-bg.png


BIN
unpackage/release/apk/__UNI__F0D4DD1__20220525150609.apk → unpackage/release/apk/__UNI__F0D4DD1__20220527112107.apk


BIN
unpackage/release/apk/__UNI__F0D4DD1__20220525132701.apk → unpackage/release/apk/__UNI__F0D4DD1__20220530095153.apk


BIN
unpackage/release/apk/__UNI__F0D4DD1__20220530101612.apk


BIN
unpackage/release/apk/__UNI__F0D4DD1__20220530141937.apk


Some files were not shown because too many files changed in this diff