Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

project.config.json

@@ -18,7 +18,7 @@
     "scopeDataCheck": false,
     "uglifyFileName": false,
     "checkInvalidKey": true,
-    "checkSiteMap": true,
+    "checkSiteMap": false,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
     "useMultiFrameRuntime": true,

src/common/api/order.js

@@ -155,7 +155,7 @@ let orderApiFun = function(vm){
 	let listAccessHistory= async (params = {}) => await vm.$u.get(prefix + vm.vuex_token +'/myinfo/access/history', params, jsonType);
 	
 	// 获取我的钱包-资产信息
-	let getAssets = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/total', params);
+	let getAssets = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v3/total', params);
 	// 获取我的钱包-收入流水
 	let listStatement = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/statement', params);
 	// 获取我的钱包-支付单一览

src/components/appoint/appoint-time.vue

@@ -26,12 +26,12 @@
 					</view>
 				</view>
 				<!-- weekChange -->
-				<view class="select-time u-p-t-50">
+				<view class="select-time u-m-t-50">
 					<view class="u-flex u-row-between">
 						<view class="txt">选择时间：</view>
 						<view class="txt active">{{ appointRangeText }}</view>
 					</view>
-					<view class="u-p-t-30 u-flex u-flex-wrap time-list">
+					<view class="u-m-t-30 time-list">
 						<view
 							:class="{'time-item':true,'active': item.pkey===appointRange}" v-for="(item,index) in timeList"
 							:key="item.pkey">
@@ -283,12 +283,14 @@
 	}
 
 	.time-list {
-		justify-content: space-between;
-		margin-bottom: -30rpx;
+		display: flex;
+		flex-flow: row wrap;
+		align-content: flex-start;
 
 		.time-item {
+			flex: 0 0 196rpx;
 			min-width: 196rpx;
-			// margin-right: 24rpx;
+			margin-right: auto;
 			margin-bottom: 20rpx;
 			border-radius: 12rpx;
 			background-color: #F4F5F7;

src/components/createCom/XhFiles.vue

@@ -8,7 +8,7 @@
 			</view> -->
 			<view class="pics u-flex u-flex-wrap">
 				<view class="img-list" v-for="(item,index) in imgList" :key="index">
-					<u-image class="pic" width="160" height="160" :src="item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
+					<u-image class="pic" width="160" height="160" :src="item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'" :border-radius="10" @click.stop="prviewImage(item,index)"></u-image>
 					<view class="icon-del-box" @click.stop="delFile(index)">
 						<view class="icon-del"></view>
 						<view class="icon-del rotate"></view>
@@ -129,18 +129,16 @@
 			},
 			closeTake(val) {
 				if(val && val.length > 0){
-					val.forEach((item,index,array)=>{
-						item.path = item.key
-						item.src = item.key
+					val.forEach(item=>{
 					    this.imgList.push(item)
 					})
 					this.setValue()
 				}
 				this.takeStatus = false
 			},
-			prviewImage(url, index) {
+			prviewImage(item, index) {
 				uni.previewImage({
-					urls: [url],
+					urls: [item.path ? item.path : item.src],
 					current: index
 				});
 			},

src/components/mine/settlement.vue

@@ -29,7 +29,7 @@
 						payableRecordNumber: 'EE999777',
 						settlementAmount: 9899
 					}
-				}
+				},
 			}
 		},
 		data() {
@@ -53,7 +53,16 @@
 				}
 			},
 			timeText() {
-				return this.$u.timeFormat(this.data.paymentTime, 'mm.dd')
+				let now = this.moment().startOf('day').unix()
+				let yesterday = this.moment(now*1000).subtract(1, 'days').unix()
+				let date = this.moment(this.data.updateDatetime).startOf('day').unix()
+				if(date == now) {
+					return '今天'
+				} else if(date == yesterday) {
+					return '昨天'
+				} else {
+					return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd')
+				}
 			}
 		},
 		methods: {

src/components/mine/statement.vue

@@ -59,8 +59,17 @@
 				return this.isWarranty + '-' + this.data.orderServiceTypeText
 			},
 			timeText() {
+				let now = this.moment().startOf('day').unix()
+				let yesterday = this.moment(now*1000).subtract(1, 'days').unix()
+				let date = this.moment(this.data.updateDatetime).startOf('day').unix()
+				if(date == now) {
+					return '今天'
+				} else if(date == yesterday) {
+					return '昨天'
+				} else {
 					return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd')
 				}
+			}
 		},
 		methods:{
 			handleClick() {

src/components/photo/preview.vue

@@ -64,7 +64,7 @@
 					return
 				}
 				let path = ''
-				if(photo.tempPath.origin){
+				if(photo.tempPath.origin && photo.waterSetting.hasOrigin){
 					// 保存原图到本地
 					path = photo.tempPath.origin
 					let result =  await this.saveLocal(path)
@@ -136,7 +136,12 @@
 				uni.hideLoading()
 				// 当前项的图片显示
 				// 拍照项张数目增加 等于10张
-				photo.allImages.unshift(this.fileMaps[0])
+				photo.allImages.unshift(
+					{
+						key: photo.tempPath.mixWater,
+						src: this.fileMaps[0].key
+					}
+				)
 				if(photo.currentItemLength<10){
 					this.$emit('changeType', 1)
 				}else{

src/components/upload/index.js

@@ -11,7 +11,7 @@ export default {
 		};
 	},
 	created() {
-		console.log(uploader,'uploader')
+		// console.log(uploader,'uploader')
 		// this.initQiniu()
 	},
 	methods: {	

src/pages/index/index.vue

@@ -262,10 +262,11 @@
 				this.triggered = "restore";
 			},
 			reachBottom() {
-				console.log(this.currentLoadStatus)
+				if (this.vuex_token) {
 					if (this.currentLoadStatus != 'loadmore') return
 					this.currentLoadStatus == 'loading'
 					this.loadOrderList()
+				}
 			},
 			onPulling(e) {
 				console.log("onpulling", e);

src/pages/learn/section.vue

@@ -138,9 +138,7 @@
                 this.changeActiveAction()
             },
             changeActiveAction() {
-                // debugger
                 let activeKey = 0
-                // debugger
                 for (let i in this.sectionList) {
                     this.sectionList[i].isActive = this.section_id == this.sectionList[i].id ? true : false;
                     if(this.sectionList[i].isActive){

src/pages/login/index.vue

@@ -126,12 +126,12 @@ export default {
 		signupLogin(e) {
 			var that = this
 			if (!e || !e.detail || e.detail.errMsg.indexOf('user deny') > -1) {
-				wx.showModal({
+				uni.showModal({
 					title: '提示',
 					showCancel: false,
 					content: '用户未授权不能完成注册'
 				});
-			} else {
+			} else if(!e.detail.errMsg && e.detail.encryptedData && e.detail.iv) {
 				let params = {
 					nickname: app.globalData.authUserInfo.nickName,
 					avatar: app.globalData.authUserInfo.avatarUrl,
@@ -155,12 +155,14 @@ export default {
 					}
 				}).catch(res => {
 					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					});
 					this.setLoginStatus(false)
 				})
+			} else {
+				uni.showModal({
+					title: '提示',
+					showCancel: false,
+					content: e.detail.errMsg || '授权失败，请重新授权'
+				});
 			}
 		},
 
@@ -191,11 +193,13 @@ export default {
 		setUserData(userInfo) {
 		  if (userInfo && userInfo.token) {
 		    // 如果已经登录则直接获取相关信息
-		    util.setOpenid(userInfo.wxopenid);
-			this.$u.vuex('vuex_token',userInfo.token ); 
-		    uni.setStorageSync("user-info", userInfo);
+			this.$u.vuex('vuex_token',userInfo.token);
+			this.$u.vuex('vuex_user', userInfo);
+			this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
 		  } else {
 		    this.$u.vuex('vuex_token', '');
+			this.$u.vuex('vuex_user', null);
+			this.$u.vuex('vuex_wx_uid', '');
 		  }
 		},
 

src/pages/mine/address/index.vue

@@ -3,11 +3,11 @@
 		<w-navbar title="收货地址"></w-navbar>
 		<view class="item">
 			<view class="top">
-				<view class="name">{{ settledInfo.id_card_name || settledInfo.nickname || settledInfo.name || '--' }}</view>
-				<view class="phone">{{ settledInfo.mobile }}</view>
+				<view class="name">{{ settled.id_card_name || settled.nickname || settled.name || '--' }}</view>
+				<view class="phone">{{ settled.mobile }}</view>
 			</view>
 			<view class="bottom">
-				<view class="address">{{ settledInfo.address }}</view>
+				<view class="address">{{ settled.address }}</view>
 				<u-icon :name="editPen" :size="32" color="#999999" @tap="toAddSite('修改地址')"></u-icon>
 			</view>
 			<view class="default" v-show="true">

src/pages/mine/wallet/index.vue

@@ -42,6 +42,7 @@
 			</view>
 			<view class="line-view" v-if="hasList"></view>
 			<view class="list-view" v-if="hasList">
+				<u-gap height="20" v-if="loading"></u-gap>
 				<view class="u-flex u-row-center" v-if="loading">
 					<u-loading color="#2272FF" :show="loading"></u-loading>
 				</view>
@@ -54,6 +55,7 @@
 </template>
 
 <script>
+	let now = new Date(new Date().toLocaleDateString()).getTime();
 	import Statement from "@/components/mine/statement.vue"
 	export default {
 		components: {

src/pages/mine/warehouse/index.vue

@@ -30,7 +30,7 @@
 						<view class="width-132 break">{{ item.businessNumber }}</view>
 						<view class="width-210 break">{{ item.skuName }}</view>
 						<view class="width-80 center">{{ item.outAmount }}</view>
-						<view class="width-140 break">{{ item.createTime | datefmt('YYYY.MM.DD HH:mm:ss')}}</view>
+						<view class="width-140 create-time">{{ (item.updateTime || item.createTime) | datefmt('YYYY.MM.DD HH:mm:ss')}}</view>
 					</view>
 					<u-loadmore :status="status" @loadmore="loadRecord" />
 				</view>
@@ -49,7 +49,7 @@
 				total: 100,
 				search: {
 					pageNumber: 0,
-					pageSize: 20,
+					pageSize: 10,
 				},
 			};
 		},
@@ -67,21 +67,14 @@
 			getData() {
 				let self = this
 				self.initDetails()
-				self.search.pageNumber = ++ self.search.pageNumber;
 				self.loadAccess()
 			},
 			async initDetails() {
 				let self = this
 				let res = await self.$u.api.listBystock()
 				if(res && res.code == 200) {
-					self.details = res.data.list
+					self.details = res.data
 				}
-				
-				// 测试数据
-				self.details = [
-					{skuName: '广汽新能源立柱-特来电', systemStock: 1},
-					{skuName: '广汽新能源-星星', systemStock: 14}
-				]
 			},
 			loadRecord() {
 				if(this.status == 'nomore') return ;
@@ -91,34 +84,10 @@
 			},
 			async loadAccess() {
 				let self = this
-				/* 
-					/wxh-worker-rest/rest/{token}/myinfo/access/history
-					路径参数：
-					 token=xxxx 
-					Headers:
-					Content-Type: application/json
-					Query:
-					pageNumber=0
-					pageSize=10
-				 */
 				let res = await self.$u.api.listAccessHistory(self.search)
 				if(res && res.code == 200) {
 					self.total = res.data && res.data.total || self.total
 					let list = res.data && res.data.list && self.$u.deepClone(res.data.list) || [];
-					// 测试数据
-					list = [
-						{businessNumber: 'OR20210507332669', skuName: '广汽新能源立柱红红火火恍恍惚惚', outAmount: 1, createTime: Date.now()},
-						{businessNumber: 'OR20210507332775', skuName: '广汽新能源星星点灯', outAmount: 1, createTime: Date.now()},
-						{businessNumber: 'OR20210507332020', skuName: '广汽新能源星星点灯', outAmount: 6, createTime: Date.now()},
-						{businessNumber: 'OR20210507332333', skuName: '广汽新能源立柱啦啦啦啦啦啦啦', outAmount: 1, createTime: Date.now()},
-						{businessNumber: 'OR20210507334689', skuName: '广汽新能源立柱', outAmount: 12, createTime: Date.now()},
-						{businessNumber: 'OR20210507339991', skuName: '广汽新能源立柱啦啦啦啦啦啦啦', outAmount: 12, createTime: Date.now()},
-						{businessNumber: 'OR20210507332660', skuName: '广汽新能源立柱', outAmount: 12, createTime: Date.now()},
-						{businessNumber: 'OR20210507332669', skuName: '广汽新能源立柱红红火火恍恍惚惚', outAmount: 1, createTime: Date.now()},
-						{businessNumber: 'OR20210507332775', skuName: '广汽新能源星星点灯', outAmount: 1, createTime: Date.now()},
-						{businessNumber: 'OR20210507332333', skuName: '广汽新能源立柱啦啦啦啦啦啦啦', outAmount: 1, createTime: Date.now()},
-					]
-					
 					if(list && list.length) {
 						self.record.push(...list)
 						if(self.total > self.record.length) {
@@ -176,6 +145,9 @@
 					line-height: 38rpx;
 					display: flex;
 					justify-content: space-between;
+					.create-time {
+						letter-spacing: 0.03rpx
+					}
 				}
 			}
 		}

src/pages/order/detail.vue

@@ -232,6 +232,7 @@
 				num:0,
 				showTimeOut:true,
 				clicking: false,
+				dateItem: null
 			}
 		},
 		onLoad(option) {
@@ -293,7 +294,6 @@
 					// uni.getLocation({
 					// 	type: 'gcj02', //返回可以用于uni.openLocation的经纬度
 					// 	success: function (res) {
-						debugger
 							const latitude = this.contactAddressLatitud //res.latitude;
 							const longitude =this.contactAddressLongitud //res.longitude;
 							uni.openLocation({
@@ -461,10 +461,12 @@
 				let params = {
 					num: this.num
 				}
+				self.dateItem = null
 				let res = await this.$u.api.workerCalendar(params)
 				if(res && res.code == 200) {
 					self.dateList = res.data
 				}
+				this.loadTimerange()
 			},
 			/* 加载预约时间段 */
 			async loadTimerange() {
@@ -473,20 +475,24 @@
 				if(res && res.code == 200) {
 					let list = res.data
 					list.map((item, index) => {
-						item.disabled = false
+						if(self.dateItem && self.dateItem.timeRange.indexOf(item.pkey) > -1 || item.isEnd) {
+							item.disabled = true
+						} else {
+							false
+						}
 					})
 					self.timeList = list
 				}
 			},
 			dateChange(data){
-				// this.loadTimerange()
 				// 点击日期选择
 				console.log(data,'dateChange')
 				let self = this
 				self.appointmentDatetime = data.item.day
+				self.dateItem = data.item
 				self.appointmentDatetimeRange = null
 				self.timeList.map((item, index) => {
-					if(data.item.timeRange.indexOf(item.pkey) > -1) {
+					if(data.item.timeRange.indexOf(item.pkey) > -1 || item.isEnd) {
 						item.disabled = true
 					} else {
 						item.disabled = false
@@ -683,9 +689,13 @@
 				var data={}
 				this.$u.api.checkRejectable(data).then(res => {
 					if (res.code === 200 ) {
-						if( res.data === true){
-							uni.navigateTo({
-								url: 'pages/order/refuse?orderId='+this.order.orderId
+						if( res.data && res.data.rejectable){
+							this.$u.route({
+								url: 'pages/order/refuse',
+								params: {
+									orderId: this.order.orderId,
+									count: res.data.remainderTimes
+								}
 							})
 						}else{
 							this.commonToast("本月无拒单机会，请联系客服","warning")

src/pages/order/feedback.vue

@@ -246,7 +246,7 @@ export default {
 					if (self.dateList && self.timeList) {
 						self.timeList.map((item, index) => {
 							if (self.dateItem 
-								&& self.dateItem.timeRange.indexOf(item.pkey) > -1) {
+								&& self.dateItem.timeRange.indexOf(item.pkey) > -1 || item.isEnd) {
 								item.disabled = true;
 							} else {
 								item.disabled = false;

src/pages/order/refuse.vue

@@ -50,7 +50,7 @@
 					rejectReason: '',
 					remark: ''
 				},
-				count: 0, // 剩余次数
+				count: 3, // 剩余次数
 			};
 		},
 		computed: {
@@ -62,18 +62,31 @@
 			PopView
 		},
 		onLoad(e) {
-			if(e && e.orderId) {
+			if(e) {
+				if(e.orderId) {
 					this.orderId = e.orderId
+				} else if(e.count) {
+					this.count = e.count
 				}
+			}
+			if(!this.count) {
 				this.getRejectCount()
+			}
 		},
 		methods: {
 			changeReason(reason) {
 				this.formData.rejectReason = reason
 			},
 			getRejectCount() {
+				let self = this
 				// 获取拒单次数
-				this.count = 3
+				self.$u.api.checkRejectable({}).then(res => {
+					if (res.code === 200 && res.data && res.data.rejectable) {
+						self.count = res.data.remainderTimes
+					} else {
+						self.count = 0
+					}
+				})
 			},
 				
 			handleClickSubmit() {

src/utils/login.js

@@ -55,17 +55,17 @@ function signup(data) {
             if (res.code == 200 && res.data) {
                 resolve(res);
             } else {
+				console.log(res.message)
 				uni.showModal({
-                    title: '用户授权失败',
-                    content: res.message,
+				    content: '登录失败',
 				    showCancel: false
 				});
                 reject(res);
             }
         } else {
 			uni.showModal({
-                title: '请求失败',
-                content: res.message
+			    content: '请求失败',
+			    showCancel: false
 			});
         }
     });