Ver Fonte

Merge branch 'develop_szhj07' of jianguan-web/repairYimatong-mini-html into master

李磊 há 2 anos atrás
pai
commit
cee6d02b52

+ 1 - 1
App.vue

@@ -1,7 +1,7 @@
 <script>
 	export default {
 		globalData: {
-			// baseUrl: 'http://192.168.0.103:9110/saas/clz/', // 本地
+			// baseUrl: 'http://192.168.2.103:7002/saas/clz/', // 本地
 			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},

+ 7 - 7
api/login.js

@@ -3,7 +3,7 @@ import request from './request';
 // 微信授权登录
 export const wxlogin = params => {
   return request({
-    url: 'auth/wxlogin',
+    url: 'wxauth/wxlogin',
     data: params,
     method: 'post'
   },true)
@@ -11,7 +11,7 @@ export const wxlogin = params => {
 // 获取openid
 export const code2Session = params => {
   return request({
-    url: 'auth/getOpenId',
+    url: 'wxauth/getOpenId',
     data: params,
     method: 'get'
   })
@@ -19,7 +19,7 @@ export const code2Session = params => {
 // 手机登录
 export const login = params => {
   return request({
-    url: `auth/loginVerify`,
+    url: `wxauth/loginVerify`,
     data: params,
     method: 'post',
   })
@@ -29,7 +29,7 @@ export const checkLogin = () => {
   let token = uni.getStorageSync('token')
   if (token&&token!='') {
     return request({
-      url: `auth/checkLogin`,
+      url: `wxauth/checkLogin`,
       method: 'get'
     })
   } else {
@@ -44,7 +44,7 @@ export const checkLogin = () => {
 // 退出登录
 export const logout = params => {
   return request({
-    url: `auth/logout`,
+    url: `wxauth/logout`,
     data: params,
     method: 'get'
   })
@@ -52,7 +52,7 @@ export const logout = params => {
 // 获取图片验证码
 export const getCaptcha = randomCode => {
   return request({
-    url: `auth/captchaCreate/${randomCode}`,
+    url: `wxauth/captchaCreate/${randomCode}`,
     method: 'get',
     responseType: 'text',
   },true)
@@ -60,7 +60,7 @@ export const getCaptcha = randomCode => {
 // 验证手机
 export const sendLoginVerifyCode = params => {
   return request({
-    url: `auth/sendVerifyCode`,
+    url: `wxauth/sendVerifyCode`,
     method: 'post',
 	data:params,
   },true)

+ 1 - 1
api/request.js

@@ -20,7 +20,7 @@ function request(options,hasNoToken) {
 	if(userInfo.sysUserFlag == '0'){
 		header['auth-token'] = hasNoToken ? '' : uni.getStorageSync('token')
 	}else{
-		header['authorization'] = hasNoToken ? '' : uni.getStorageSync('token')
+		header['access-token'] = hasNoToken ? '' : uni.getStorageSync('token')
 	}
 	_obj.header = header
 	_obj.header['X-HEADER-APPID'] = '!z2Yc.aes|STw5oReFk+wACvW4IGVHZsFe+/MgMT9cp0amuic1gqE=';

+ 2 - 2
pages/index/index.vue

@@ -351,7 +351,7 @@
 			},
 			// 获取上方滚动扫描记录
 			getScrollLog(){
-				scanVinLogQueryRoll({pageNo:1,pageSize:1000}).then(res => {
+				scanVinLogQueryRoll({pageNo:1,pageSize:50}).then(res => {
 					console.log(res)
 					this.list = res.data.list || []
 					this.list.map(item => {
@@ -391,7 +391,7 @@
 				})
 			},
 			getRedScroll(){
-				getRewardRollList({pageNo:1,pageSize:1000}).then(res => {
+				getRewardRollList({pageNo:1,pageSize:50}).then(res => {
 					this.slist = res.data || []
 					this.slist.map(item => {
 						item.placeText = item.userName + '刚刚得到了'+item.totalRewardAmount+'元 红包奖励'

+ 7 - 5
pages/morePage/morePage.vue

@@ -124,11 +124,13 @@
 			},
 		},
 		onShow() {
-			const shelfInfo = this.$store.state.vuex_storeShelf
-			this.shelfSn = shelfInfo.shelfSn
-			this.dealerPhone = shelfInfo&&shelfInfo.contactMobile ? shelfInfo.contactMobile : ''
-			this.getPriceCofig()
-		},
+				const shelfInfo = this.$store.state.vuex_storeShelf
+				this.shelfSn = shelfInfo ? shelfInfo.shelfSn : ''
+				this.dealerPhone = shelfInfo&&shelfInfo.contactMobile ? shelfInfo.contactMobile : ''
+				if(this.shelfSn){
+					this.getPriceCofig()
+				}
+			},
 		methods: {
 			beforeSwitch(index){
 				if(index==1){

+ 10 - 3
pages/storeManage/storeAuth.vue

@@ -45,8 +45,8 @@
 				<u-form-item label="联系人手机">
 					{{form.contactPhone}}
 				</u-form-item>
-				<u-form-item label="汽配商邀请码">
-					<u-input v-model="form.inviteCode" maxlength="30" :clearable="false" @input="inputDealer" @blur="findDealer" @confirm="findDealer" placeholder="如没有可不填"/>
+				<u-form-item label="汽配商邀请码" required prop="inviteCode">
+					<u-input v-model="form.inviteCode" maxlength="30" :clearable="false" @input="inputDealer" @blur="findDealer" @confirm="findDealer" placeholder="请输入邀请码"/>
 				</u-form-item>
 				<u-form-item label="汽配商" v-if="form.inviteName.length">
 					{{form.inviteName||'--'}}
@@ -79,7 +79,7 @@
 				<u-form-item label="联系人手机">
 					{{form.contactPhone||'--'}}
 				</u-form-item>
-				<u-form-item label="汽配商邀请码">
+				<u-form-item label="汽配商邀请码" required prop="inviteCode">
 					{{form.inviteCode||'未填写'}}
 				</u-form-item>
 				<u-form-item label="汽配商" v-if="form.inviteName.length">
@@ -154,6 +154,13 @@
 					// 		trigger: 'change'
 					// 	}
 					// ],
+					inviteCode: [
+						{
+							required: true, 
+							message: '请输入汽配商邀请码', 
+							trigger: 'change'
+						}
+					],
 					contactName: [
 						{
 							required: true, 

+ 6 - 4
pagesA/digitalShelf/choosePart.vue

@@ -87,7 +87,7 @@
 						 </view>
 					</view>
 					<!-- 其它配件 -->
-					<view class="nav-right-title flex align_center justify_between" @click="showOther=!showOther" style="margin-top: 20rpx;">
+					<view class="nav-right-title flex align_center justify_between" @click="showOther=!showOther">
 						其它配件
 						<text>{{showOther?'隐藏':'展开'}}</text>
 					</view>
@@ -133,7 +133,7 @@
 					<view v-if="partList&&partList.length==0">
 						<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="150"></u-empty>
 					</view>
-					<view style="padding: 20upx;">
+					<view style="padding: 20upx;" v-if="showOther">
 						<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 					</view>
 				</scroll-view>
@@ -487,7 +487,7 @@
 			},
 			// 加载更多
 			onreachBottom () {
-				if(this.partList.length < this.total ){
+				if(this.partList.length < this.total && this.showOther){
 					this.pageNo++
 					this.getShelfProductList()
 				}else{
@@ -752,6 +752,7 @@
 			}
 		}
 		.right-list{
+			position: relative;
 			flex-grow: 1;
 			background: #fff;
 			height: 100%;
@@ -760,7 +761,8 @@
 				height: 100%;
 				.nav-right-title{
 					font-weight: bold;
-					padding: 5upx 25upx;
+					padding: 20upx 25upx;
+					border-bottom: 2rpx solid #eee;
 					> text{
 						color: #9E9E9E;
 						font-weight: normal;