修改

assets/http/api.js

@@ -41,6 +41,7 @@ const shop={
 	statistic:p => http.get('shop/indexInfo',{params:p}),
 	memberInfo:p => http.get('shop/memberInfo',{params:p}),
 	shopBillsInfo:p => http.get('shop/shopBillsInfo',{params:p}),
+	feedback: p => http.post('ldt_feedback/feedback/submit', p)
 }
 
 

assets/http/service.js

@@ -1,7 +1,7 @@
 import Request from 'luch-request'
 
-let baseURL = 'https://ldt.guosen-fumao.cn/api/'
-// let baseURL = 'http://192.168.1.168:2366/'
+// let baseURL = 'https://ldt.guosen-fumao.cn/api/'
+let baseURL = 'http://192.168.1.168:2366/'
 
 let refreshTokenUrl = baseURL + "blade-auth/oauth/token"
 
@@ -90,19 +90,23 @@ http.interceptors.response.use(async (response) => {
 				}
 			})
 			if (res.data && res.data.error_description=="用户名或密码不正确") {
-				uni.showModal({
-					title:"提示",
-					content:"登录失败",
-					showCancel:false,
-					success: (res) => {
-						if (res.confirm) {
-							uni.clearStorage()
-							uni.reLaunch({
-								url:"/pages/login/account-login"
-							})
-						}
-					}
+				uni.clearStorage()
+				uni.reLaunch({
+					url:"/pages/login/account-login"
 				})
+				// uni.showModal({
+				// 	title:"提示",
+				// 	content:"登录失败",
+				// 	showCancel:false,
+				// 	success: (res) => {
+				// 		if (res.confirm) {
+				// 			uni.clearStorage()
+				// 			uni.reLaunch({
+				// 				url:"/pages/login/account-login"
+				// 			})
+				// 		}
+				// 	}
+				// })
 				return
 			}
 			

pages.json

@@ -362,6 +362,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/feedback/feedback",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "用户反馈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/bill/bill.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 		<view class="top">
 			<view class="tixian">

pages/card/card.vue

@@ -56,7 +56,7 @@
 					{
 						icon: '/static/icon/wendang.png',
 						name: '意见反馈',
-						path: ''
+						path: '/pages/card/feedback'
 					},
 				],
 				isOpenMemberShow:false

pages/card/feedback.vue

@@ -1,6 +1,28 @@
 <template>
-	<view>
-		
+	<view class="question">
+		<u-form :model="form" ref="uForm" label-position="top">
+			<u-form-item label="问题反馈" prop="content">
+				<u-input height="200" class="u-input" v-model="form.content" placeholder="请输入问题描述" type="textarea" />
+				<view class="cu-form-group" style="padding: 0;">
+					<view class="grid col-4 grid-square flex-sub">
+						<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
+							:data-url="imgList[index]">
+							<image :src="imgList[index]" mode="aspectFill"></image>
+							<view class="cu-tag bg-red" style="width: 50rpx;height: 50rpx;" @tap.stop="DelImg" :data-index="index">
+								<text class='cuIcon-close'></text>
+							</view>
+						</view>
+						<view class="solids" @tap="chooseImage" v-if="imgList.length<4">
+							<text class='cuIcon-cameraadd'></text>
+						</view>
+					</view>
+				</view>
+			</u-form-item>
+			<u-form-item label="联系方式" prop="phone">
+				<u-input height="100" class="u-input" v-model="form.phone" placeholder="请留下您的联系方式" type="number" />
+			</u-form-item>
+			<u-button :custom-style="customStyle" @click="submit">提 交</u-button>
+		</u-form>
 	</view>
 </template>
 
@@ -8,15 +30,67 @@
 	export default {
 		data() {
 			return {
-				
+				form: {
+					content: '',
+					phone: this.$cache.get('phone')
+				},
+				imgList:[],
+				customStyle: {
+					backgroundColor: '#FF9447',
+					marginTop: '80rpx',
+					color: '#fff'
+				}
 			}
 		},
 		methods: {
-			
+			ViewImage(e) {
+				uni.previewImage({
+				 urls: this.imgList,
+				 current: e.currentTarget.dataset.url
+				});
+			   },
+			   DelImg(e) {
+				uni.showModal({
+				 title: '提示',
+				 content: '确定要删除吗？',
+				 success: res => {
+				  if (res.confirm) {
+				   this.imgList.splice(e.currentTarget.dataset.index, 1)
+				  }
+				 }
+				})
+			   },
+			async chooseImage(){
+				let res=await this.$mpi.chooseImage()
+				this.$api.uploadFile(res[0]).then(res=>{
+					this.imgList.push(res.data.link)
+				})
+			},
+			async submit() {
+				if (!this.form.content) {
+					this.$u.toast('请输入反馈内容')
+					return
+				}
+
+				let p = {
+					type: 2,
+					userId: this.vuex_shopId,
+					content: this.form.content,
+					pics: this.imgList.length > 0 ? this.imgList.join(",") : '',
+					phone: this.form.phone,
+					handleStatus: 0
+				}
+				let res = await this.$api.shop.feedback(p)
+				this.$dialog.showModalAndBack("提交成功")
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.question {
+		padding: 32rpx;
+		background-color: #fff;
+		min-height: 100vh;
+	}
 </style>

pages/feedback/feedback.vue

@@ -0,0 +1,96 @@
+<template>
+	<view class="question">
+		<u-form :model="form" ref="uForm" label-position="top">
+			<u-form-item label="问题反馈" prop="content">
+				<u-input height="200" class="u-input" v-model="form.content" placeholder="请输入问题描述" type="textarea" />
+				<view class="cu-form-group" style="padding: 0;">
+					<view class="grid col-4 grid-square flex-sub">
+						<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
+							:data-url="imgList[index]">
+							<image :src="imgList[index]" mode="aspectFill"></image>
+							<view class="cu-tag bg-red" style="width: 50rpx;height: 50rpx;" @tap.stop="DelImg" :data-index="index">
+								<text class='cuIcon-close'></text>
+							</view>
+						</view>
+						<view class="solids" @tap="chooseImage" v-if="imgList.length<4">
+							<text class='cuIcon-cameraadd'></text>
+						</view>
+					</view>
+				</view>
+			</u-form-item>
+			<u-form-item label="联系方式" prop="phone">
+				<u-input height="100" class="u-input" v-model="form.phone" placeholder="请留下您的联系方式" type="number" />
+			</u-form-item>
+			<u-button :custom-style="customStyle" @click="submit">提 交</u-button>
+		</u-form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {
+					content: '',
+					phone: ''
+				},
+				imgList:[],
+				customStyle: {
+					backgroundColor: '#FF9447',
+					marginTop: '80rpx',
+					color: '#fff'
+				}
+			}
+		},
+		methods: {
+			ViewImage(e) {
+				uni.previewImage({
+				 urls: this.imgList,
+				 current: e.currentTarget.dataset.url
+				});
+			   },
+			   DelImg(e) {
+				uni.showModal({
+				 title: '提示',
+				 content: '确定要删除吗？',
+				 success: res => {
+				  if (res.confirm) {
+				   this.imgList.splice(e.currentTarget.dataset.index, 1)
+				  }
+				 }
+				})
+			   },
+			async chooseImage(){
+				let res=await this.$mpi.chooseImage()
+				this.$api.uploadFile(res[0]).then(res=>{
+					this.imgList.push(res.data.link)
+				})
+			},
+			async submit() {
+				if (!this.form.content) {
+					this.$u.toast('请输入反馈内容')
+					return
+				}
+
+				let p = {
+					type: 2,
+					userId: this.vuex_shopId,
+					content: this.form.content,
+					pics: this.imgList.length > 0 ? this.imgList.join(",") : '',
+					phone: this.form.phone,
+					handleStatus: 0
+				}
+				let res = await this.$api.shop.feedback(p)
+				this.$dialog.showModalAndBack("提交成功")
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.question {
+		padding: 32rpx;
+		background-color: #fff;
+		min-height: 100vh;
+	}
+</style>

pages/my-bills/comps/balance-bills.vue

@@ -74,7 +74,12 @@
 				</navigator>
 			</mescroll>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		
+		<view class="center flex-direction" style="width: 100%;margin-top: 180rpx;" v-show="stateCurrent==1">
+			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
+		</view>
+		
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/my-bills/comps/bills.vue

@@ -62,7 +62,7 @@
 				</navigator>
 			</mescroll>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/my-bills/comps/channel-point-bill.vue

@@ -73,7 +73,12 @@
 				</navigator>
 			</mescroll>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		
+		<view class="center flex-direction" style="width: 100%;margin-top: 180rpx;" v-show="stateCurrent==1">
+			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
+		</view>
+		
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/my-bills/comps/point-bills.vue

@@ -73,7 +73,12 @@
 				</navigator>
 			</mescroll>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		
+		<view class="center flex-direction" style="width: 100%;margin-top: 180rpx;" v-show="stateCurrent==1">
+			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
+		</view>
+		
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/shop-info/shop-info.vue

@@ -10,7 +10,7 @@
 			<view class="title u-flex u-row-between u-col-center">
 				<text v-if="step==1">请选择商家类型</text>
 				<text v-else>完善商家资料</text>
-				<text v-show="step<=totalStep && step!=1" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
+				<text v-show="step<=totalStep && step!=1 && (isEdit&&step!=2)" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
 			</view>
 			
 			<u-form :model="form" :label-width="labelWidth" ref="uForm">
@@ -220,7 +220,7 @@
 					</view>
 				</view>
 				
-				<view v-show="settlementAccountShow">
+				<view v-show="settlementAccountShow" style="height: 900rpx;padding-bottom: 40rpx;">
 					<view class="border">
 						<u-form-item :request="true" label="请填写结算银行账户号码" prop="bankCardNo" label-position="top">
 							<u-input :border="false" placeholder="请填写结算银行账户号码" v-model="auditForm.bankCardNo">
@@ -230,7 +230,7 @@
 							<u-input type="select" placeholder="请选银行择账户类型" v-model="auditForm.bankAccountTypeLabel" @click="bankAccountTypeShow = true"/>
 						</u-form-item>
 						<u-form-item :request="true" label="银行类型" label-position="top">
-							<u-input type="select" placeholder="请选择银行类型" v-model="auditForm.bankCodeLabel" @click="bankCodeShow = true"/>
+							<u-input :border="false" type="select" placeholder="请选择银行类型" v-model="auditForm.bankCodeLabel" @click="bankCodeShow = true"/>
 						</u-form-item>
 					</view>
 				</view>
@@ -733,6 +733,7 @@
 			if (options.edit) {
 				//修改资料
 				this.isEdit = true
+				this.step=2
 				this.fetchShopDetail(this.vuex_shopId)
 				this.fetchAuditDetail(this.vuex_shopId)
 			} else if (options.isFail) {
@@ -931,7 +932,7 @@
 						return
 					}
 					if (this.imgList.length <2) {
-						this.$u.toast('请依次上传门头，店内')
+						this.$u.toast('请依次上传门头，店内照片')
 						return
 					}
 				}

pages/statistics/pointBillStatistics.vue

@@ -55,7 +55,7 @@
 				</view>
 			</mescroll-body>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/statistics/statistics.vue

@@ -55,7 +55,7 @@
 				</view>
 			</mescroll-body>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params" :default-time="defaultTime" @confirm="confirmTime">
+		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/withdraw/withdraw.vue

@@ -56,12 +56,6 @@
 					<text class="">0.05%</text>
 				</view>
 			</view>
-			
-			<view @click="$jump('/pages/withdraw/records')" class="btn-withdraw">
-				<view class="cu-btn round sm btn" style="font-size: 26rpx;">
-					提现记录
-				</view>
-			</view>
 		</view>
 
 		<u-popup v-model="rateShow" :mask-close-able="false" mode="center" height="40%" width="76%" borderRadius="20"