Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

api/api.js

@@ -5,11 +5,9 @@ const apiService = {
 	 /**
 	  * 登录
 	  */
-	login(passWord,phone) {
-		console.log(passWord,phone,888888888);
-		
+	login(passWord,username) {
 		// return http.get('/merchant/app/loginPassWord',params)	
-		return http.get('/merchant/app/loginPassWord?passWord='+passWord+'&phone='+phone)	
+		return http.get('/merchant/app/loginPassWord?password='+passWord+'&username='+username +'&userType=2')	
 	},
 	/**
 	  * 手机号码登录

common/service/config.service.js

@@ -2,12 +2,12 @@ let BASE_URL = ''
 
 
 if (process.env.NODE_ENV == 'development') {
-	// BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
-	BASE_URL = 'http://192.168.0.36:8080/jeecg-boot' // 开发环境
+	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
+	// BASE_URL = 'http://192.168.0.36:8080/jeecg-boot' // 开发环境
     // BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
 
 } else {
-	BASE_URL = 'http://boot.jeecg.org:8080/jeecg-boot' // 生产环境
+	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
 }
 let staticDomainURL = BASE_URL + '/sys/common/static';
 

components/product/refund.vue

@@ -107,7 +107,8 @@ export default {
   left: 0;
   background: rgba(0, 0, 0, 0.4);
   display: flex;
-  align-items: end;
+//   align-items: end;
+align-items: flex-end;
   z-index: 99;
 	.model{
 		width: 100%;

manifest.json

@@ -2,15 +2,15 @@
     "name" : "本地生活",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "2.2.22",
-    "versionCode" : 233,
+    "versionName" : "0.0.1",
+    "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
         "modules" : {
             "Maps" : {},
-            "Barcode" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Barcode" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -56,7 +56,8 @@
                 },
                 "privacyDescription" : {
                     "NSCameraUsageDescription" : "用于扫码功能"
-                }
+                },
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -69,9 +70,6 @@
                         "appkey_android" : "220880dab49e4a565afbf0bd989af006"
                     }
                 },
-                "push" : {
-                    "unipush" : {}
-                },
                 "geolocation" : {
                     "amap" : {
                         "name" : "amap_15513573860CluPH7RHj",
@@ -82,6 +80,9 @@
                     "system" : {
                         "__platform__" : [ "ios", "android" ]
                     }
+                },
+                "push" : {
+                    "unipush" : {}
                 }
             }
         }

pages/index/index.vue

@@ -10,7 +10,7 @@
 
 		</view>
 		<view class="data_box">
-			<view class="title">
+			<view class="title" @click="scanRecordaa">
 				今日概况
 				<image src="/static/index/today.png" mode=""></image>
 			</view>
@@ -114,6 +114,11 @@
 					url: '/pages/scan/record'
 				})
 			},
+			scanRecordaa() {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			},
 			gettodayData() {
 				this.$http.get("/merchant/app/home/todayData?merchantId=" + '111', {}).then(res => {
 					if (res.data.code == 200) {

pages/index/shop.vue

@@ -442,7 +442,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 
 			.model {
 				width: 100%;

pages/login/login.vue

@@ -81,8 +81,8 @@ export default {
 			checked: [],
 			shape: '',//round 圆形
 			loading: false,
-			userName: '15513573860',
-			password: '123456',
+			userName: '',
+			password: '',
 			phoneNo: '',
 			smsCode: '',
 			showPassword: false, //是否显示明文
@@ -153,9 +153,8 @@ export default {
 				return;
 			}
 			let loginParams = {
-				phone: this.userName,
+				username: this.userName,
 				passWord: this.password,
-				userType:'2'
 			}
 			this.loading = true;
 
@@ -168,6 +167,9 @@ export default {
 					// #ifndef APP-PLUS
 					this.$tip.success('登录成功!')
 					this.$Router.replaceAll({ name: 'index' })
+					// uni.navigateTo({
+					// 	url: '/pages/index/index'
+					// })
 					// #endif
 				} else {
 					this.$tip.alert(res.data.message);
@@ -181,9 +183,10 @@ export default {
 			})
 		},
 		saveClientId() {
-			var info = plus.push.getClientInfo();
-			var cid = info.clientid;
-			this.$http.get("/sys/user/saveClientId", { params: { clientId: cid } }).then(res => {
+		// 	var info = plus.push.getClientInfo();
+		// 	var cid = info.clientid;
+			var randomNum = new Date().getTime();
+			this.$http.get("/sys/user/saveClientId", { params: { clientId: randomNum } }).then(res => {
 				console.log("res::saveClientId>", res)
 				this.$tip.success('登录成功!')
 				this.$Router.replaceAll({ name: 'index' })

pages/login/register.vue

@@ -155,10 +155,8 @@
 			          return;
 			        }
 			        let loginParams = {
-						phone:this.userName,
+						username:this.userName,
 						passWord:this.password,
-				userType:'2'
-
 			        }
 					this.loading=true;
 				
@@ -166,11 +164,14 @@
 					  this.loading=false;
 			          if(res.data.success){
 						 // #ifdef APP-PLUS
-						  this.saveClientId()
+						//   this.saveClientId()
 						 // #endif
 						 // #ifndef APP-PLUS
 						  this.$tip.success('登录成功!')
-						  this.$Router.replaceAll({name:'index'})
+						  uni.navigateTo({
+								url: '/pages/index/index'
+							})
+						//   this.$Router.replaceAll({name:'index'})
 						 // #endif
 						}else{
 			              this.$tip.alert(res.data.message);
@@ -183,15 +184,15 @@
 					  this.loading=false;
 					})
 			},
-			saveClientId(){
-				var info = plus.push.getClientInfo();
-				var cid = info.clientid;
-				this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
-					console.log("res::saveClientId>",res)
-					this.$tip.success('登录成功!')
-					this.$Router.replaceAll({name:'index'})
-				})
-			},
+			// saveClientId(){
+			// 	var info = plus.push.getClientInfo();
+			// 	var cid = info.clientid;
+			// 	this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
+			// 		console.log("res::saveClientId>",res)
+			// 		this.$tip.success('登录成功!')
+			// 		this.$Router.replaceAll({name:'index'})
+			// 	})
+			// },
 			changePassword() {
 				this.showPassword = !this.showPassword;
 			},
@@ -230,6 +231,7 @@
 				}, 1000);
 			},
 			onSMSLogin() {
+			
 				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
 			
 				if(!this.phoneNo || this.phoneNo.length==0){
@@ -244,6 +246,14 @@
 				  this.$tip.toast('请填短信验证码');
 				  return;
 				}
+				if(!this.password ){
+				  this.$tip.toast('请输入密码');
+				  return;
+				}
+				if(!this.password1 ){
+				  this.$tip.toast('请输入新密码');
+				  return;
+				}
 				if(this.password !== this.password1){
 				  this.$tip.toast('请确定密码是否一致');
 				  return;

pages/login/settled.vue

@@ -487,6 +487,8 @@ export default {
                         let data = JSON.parse(files.data);
                         if (data.success) {
                             this.form[type] = data.message
+                            console.log(type,777);
+                            
                             if (type == 'businessLicense' || type == 'identityOne') {
                                 uni.uploadFile({
                                     url: configService.apiUrl + `${type == 'businessLicense' ? '/order/identify/businessLicense' : '/order/identify/idCard'}`,
@@ -530,7 +532,10 @@ export default {
                                     }
                                 });
                             }
+                            else{
+                                this.lodingshow = false;
 
+                            }
                         }
                     }
                 });

pages/product/creatProduct.vue

@@ -705,7 +705,7 @@
 
 					.set {
 						display: flex;
-						justify-content: end;
+						justify-content: flex-end;
 
 						/deep/.u-input {
 							text-align: right !important;
@@ -805,7 +805,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 			z-index: 99;
 
 			.model {

pages/product/group.vue

@@ -420,7 +420,8 @@
 			left: 0;
 			background: rgba(0, 0, 0, 0.4);
 			display: flex;
-			align-items: end;
+			align-items: flex-end;
+
 			z-index: 99;
 
 			.model {

pages/product/index.vue

@@ -395,7 +395,6 @@
 		justify-content: space-between;
 		background: #F7F8FC;
 
-		/*#ifdef APP-PLUS*/
 		.top {
 			width: 100%;
 			height: var(--status-bar-height);
@@ -678,7 +677,7 @@
 				.btn_box {
 					width: 100%;
 					display: flex;
-					justify-content: end;
+					justify-content: flex-end;
 					align-items: center;
 					margin-top: 20rpx;
 

pages/product/usable.vue

@@ -184,7 +184,7 @@
 				flex: 1;
 				display: flex;
 				align-items: center;
-				justify-content: end;
+				justify-content: flex-end;
 				font-size: 28rpx;
 				color: #999999;
 

pages/store/addHours.vue

@@ -5,13 +5,13 @@
         </cu-custom>
         <view class="tab-top bg-fff">
             <view class="title ">营业日</view>
-            <view style="padding-bottom:20upx;border-bottom: 1px solid #EEEEEE;">
-                <text v-for="(tag, index) in tags" :key="index" class="tag-type" :class="{
+            <view style="padding-bottom:20upx;border-bottom: 1px solid #EEEEEE;overflow: hidden;">
+                <view v-for="(tag, index) in tags" :key="index" class="tag-type" :class="{
                     'disable-background': isDisable(tag),
                     'selected-background': isSelected(tag)
                 }" :style="tag == '周四' || tag == '整周' ? 'margin-right:0' : ''" @click="toggleSelection(tag)">
                     {{ tag }}
-                </text>
+                </view>
             </view>
             <view style="padding-top:18upx">营业时段</view>
             <view class="cu-form-group" style="border-bottom: 1upx solid #eee;margin:0" v-if="timeType.length > 0">
@@ -269,7 +269,9 @@ page {
 }
 
 .tag-type {
-    display: inline-block;
+    // display: inline-block;
+    // display: flex;
+    float: left;
     font-size: 26upx;
     width: 146upx;
     height: 54upx;

plugin/colorui/main.css

@@ -44,6 +44,8 @@ image {
 image {
 	max-width: 100%;
 	display: inline-block;
+	/* flex-direction: row; 
+	justify-content: flex-start;  */
 	position: relative;
 	z-index: 0;
 }

store/index.js

@@ -32,7 +32,7 @@ export default new Vuex.Store({
     // 登录
     mLogin({ commit }, param) {
       return new Promise((resolve, reject) => {
-       api.login(param.passWord,param.phone).then(response => {
+       api.login(param.passWord,param.username).then(response => {
           if(response.data.code ==200){ 
             const result = response.data.result
             const userInfo = result.userInfo