提交

api/modules/service.js

@@ -6,6 +6,9 @@ export default {
 	index(param) {
 		return req.get("/massage/app/Index/index", param)
 	},
+	indexBanner(param) {
+		return req.get("massage/app/Index/indexBanner", param)
+	},
 	// 服务列表
 	serviceList(param) {
 		return req.get("/massage/app/Index/serviceList", param)

manifest.json

@@ -3,8 +3,8 @@
     "appid" : "__UNI__3303922",
     // "appid" : "__UNI__AE4A250",
     "description" : "希希到家",
-    "versionName" : "11.0.0",
-    "versionCode" : 1100,
+    "versionName" : "14.0.0",
+    "versionCode" : 1400,
     "transformPx" : false,
     "uniStatistics" : {
         "enable" : false //全局关闭  

pages.json

@@ -1,17 +1,13 @@
 {
 	"pages": [
 		//#ifdef  APP-PLUS
-		// app登陆页面 
 		{
-			"path": "pages/login",
+			"path": "pages/service",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "#ffffff"
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true
 			}
 		},
-		//#endif
 		{
 			"path": "pages/login",
 			"style": {
@@ -21,6 +17,11 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
+		
+		// app登陆页面 
+	
+		//#endif
+		
 		{
 			"path": "pages/service",
 			"style": {
@@ -28,6 +29,15 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
 		{
 			"path": "pages/technician",
 			"style": {

pages/login.vue

@@ -4,6 +4,9 @@
 		<!-- <view class="navbarText">登录</view> -->
 		<uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" :onlyLeft="true" :color="`#fff`"
 		></uni-nav-bar>
+		 <!-- #ifdef APP-PLUS -->
+		<u-icon name="close" size="26" @click="goHome" style="position: absolute;z-index:99;right:50upx;top:100upx;"></u-icon>
+		<!-- #endif -->
 		<view class="logocontent">
 			<!-- <view class="title">LOGO</view> -->
 			<image src="../static/logopic.png" style="width:200rpx;margin:0 auto" mode="widthFix"></image>
@@ -69,14 +72,14 @@
 		
 		<image src="@/static/wlogin.png" class="wlogin" @tap="$refs.show_rule_item.open()" mode="widthFix"></image>
 		
-		<!-- <view class="page-height flex-center flex-column">
+		<view class="page-height flex-center flex-column">
 			<image mode="aspectFill" lazy-load class="logo-img mb-md" :src="base_info.app_logo"></image>
 			<view class="f-caption c-caption">{{base_info.app_text}}</view>
 			<view @tap="$refs.show_rule_item.open()" class="wechat-login flex-center f-title c-base" :style="{
 			background: `linear-gradient(90deg, ${primaryColor} 0%, ${subColor} 99%)`}"><i
 					class="iconfont iconweixin mr-sm"></i>微信登录
 			</view>
-		</view> -->
+		</view>
 
 		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
 			<view class="common-popup-content fill-base pd-lg radius-34">
@@ -345,6 +348,12 @@
 					this.$util.hideAll()
 				}
 			},
+			goHome(){
+				this.$util.goUrl({
+					url :`/pages/service`,
+					openType: `reLaunch`
+				})
+			},
 			async toLogin(userInfo) {
 				console.log(userInfo,"mmnn")
 				let user_info = await this.$api.base.appLogin({
@@ -434,6 +443,13 @@
 				  uni.$u.toast('倒计时结束后再发送');
 				}
 			},
+		},
+		beforeDestroy() {
+			
+			this.$util.goUrl({
+				url :`/pages/service`,
+				openType: `reLaunch`
+			})
 		}
 	}
 </script>

pages/mine.vue

@@ -57,7 +57,7 @@
 					<view class="mt-md" style="height: 72rpx" v-else></view> -->
 				</view>
 			</view>
-			<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true" v-if="userPageType == 1&&userInfo.switch==1"
+			<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true" v-if="userPageType == 1&&mineInfo.switch==1"
 				:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="$util.goUrl({ url: `/user/pages/stored/list` })"
 			>
 				<!-- <view
@@ -182,7 +182,7 @@
 				</view>
 			</view> -->
 
-			<view class="mine-menu-list box-shadow fill-base radius-16">
+			<view class="mine-menu-list box-shadow fill-base radius-16" v-if="mineInfo.distributor ==1">
 				<view class="menu-title flex-between pl-lg pr-md b-1px-b">
 					<view class="f-paragraph c-title text-bold">分享赚钱</view>
 				</view>
@@ -524,6 +524,7 @@
 		}),
 		onLoad(options) {
 			this.options = options
+			console.log(this.userInfo,"564")
 			let {
 				type = 0
 			} = options
@@ -536,7 +537,7 @@
 			if (!this.mineInfo.id) {
 				this.$util.showLoading()
 			}
-			console.log(this.mineInfo,"====")
+			
 			this.initIndex()
 		},
 		onPullDownRefresh() {

pages/service.vue

@@ -13,7 +13,6 @@
 					prefixIcon="search"
 					shape="circle"
 					:disabled="true"
-					
 					prefixIconStyle="font-size: 34rpx;color: #A9B4BD"
 				></u--input>
 			</view>
@@ -228,6 +227,9 @@
 			mineInfo: state => state.user.mineInfo,
 			userPageType: state => state.user.userPageType,
 		}),
+		onShow() {
+				this.getServiceIndex()
+		},
 		async onLoad(options) {
 			this.getRecommend()
 			this.$util.showLoading()
@@ -242,7 +244,7 @@
 				this.$util.hideAll()
 				return
 			}
-			await this.getMineInfo()
+			// await this.getMineInfo()
 			await this.initIndex()
 			this.updateServiceItem({
 				key: 'pageActive',
@@ -279,7 +281,7 @@
 			...mapActions(['getConfigInfo', 'getUserInfo', 'getMineInfo','updateCommonOptions', 'getServiceList']),
 			...mapMutations(['updateServiceItem','updateUserItem']),
 			async toAtv() {
-				console.log("yyy")
+				
 				if (!this.mineInfo.is_atv) {
 					this.$util.showToast({
 						title: `暂无活动`
@@ -296,7 +298,8 @@
 			
 			
 			async getServiceIndex(param) {
-				let d = await this.$api.service.index(param);
+				
+				let d = await this.$api.service.indexBanner(param);
 				console.log(d,"====");
 				this.banner = d.banner;
 				// let {
@@ -319,10 +322,12 @@
 				if (!this.configInfo.id || refresh) {
 					await this.getConfigInfo()
 				}
+				
 				await this.getServiceIndex()
 				this.isLoad = true
 				this.isLoadBanner = true
-				await Promise.all([this.getList(1), this.getCouponList()])
+				// await Promise.all([this.getList(1), this.getCouponList()])
+				await Promise.all([this.getList(1)])
 				this.$util.setNavigationBarColor({
 					bg: this.primaryColor
 				})

pages/technician.vue

@@ -203,7 +203,8 @@
 							<view class="flex-1 ml-md">
 								<view class="flex-between">
 									<view class="flex-y-center">
-										<view class="f-paragraph c-title mr-md">{{item.nickName}}</view>
+										<!-- <view class="f-paragraph c-title mr-md">{{item.nickName}}</view> -->
+										<view class="f-paragraph c-title mr-md">匿名用户</view>
 										<view class="flex-warp">
 											<i class="iconfont iconyduixingxingshixin icon-font-color"
 												:style="{backgroundImage: aindex< item.star?`-webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%)`:`-webkit-linear-gradient(270deg, #f4f6f8 0%, #ccc 100%)`}"

unpackage/debug/.roid.ins

@@ -1 +0,0 @@
-forceInstall