流程优化处理

pages/gallery/app/addForm/addForm.vue

@@ -480,7 +480,7 @@
 					delta: 1
 				})
 				uni.navigateTo({
-					url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${this.objNo}`
+					url: `/pages/gallery/formDetail/formDetail?obj_no=${this.objNo}`
 				})
 			},
 			computeClick: function(index) {

pages/gallery/app/editAloneForm/editAloneForm.vue

@@ -67,7 +67,7 @@
 			<view class="model-out-box">
 				<view class="text-black-normal">提示</view>
 				<view class="model-content">
-					<image src="../../static/successful.png" style="width: 100rpx;height: 100rpx;"></image>
+					<image src="../../../../static/successful.png" style="width: 100rpx;height: 100rpx;"></image>
 				</view>
 				<view class="text-black-normal" style="margin-bottom: 32rpx;">提交成功</view>
 				<view style="display: flex;flex-direction: row;width: 100%;">
@@ -412,7 +412,7 @@
 					delta: 1
 				})
 				uni.navigateTo({
-					url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${this.objNo}`
+					url: `/pages/gallery/formDetail/formDetail?obj_no=${this.objNo}`
 				})
 			},
 			computeClick: function(index) {

pages/gallery/app/modeFormList/modeFormList.vue

@@ -623,7 +623,7 @@
 				}
 				if (this.businessType == 2) {
 					uni.navigateTo({
-						url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${form.obj_no}`
+						url: `/pages/gallery/formDetail/formDetail?obj_no=${form.obj_no}`
 					})
 				} else if (this.businessType == 3 || this.businessType == 4) {
 					//判断是否可编辑  未结束前的执行人可编辑

pages/gallery/app/qrcodeList/qrcodeList.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-	import uQRCode from "../../../../components/tki-qrcode/qrcode.js"
+	import uQRCode from "../../../../common/Sansnn-uQRCode/uqrcode.js"
 	export default {
 		data() {
 			return {

pages/gallery/gallery.vue

@@ -475,13 +475,12 @@
 			background: #fff;
 			display: flex;
 			margin: 0 30rpx;
-			padding: 0 30rpx;
 			flex-direction: row;
 			align-items: center;
 
 			image {
 				width: 50rpx;
-				margin-right: 20rpx;
+				margin: 0 20rpx;
 				height: 22px;
 			}
 
@@ -495,7 +494,7 @@
 			.rq-image {
 				width: 24rpx;
 				height: 16px;
-				margin: 0 10rpx 0 30rpx;
+				margin: 0 20rpx;
 			}
 		}
 

pages/index/index.vue

@@ -84,7 +84,8 @@
 				<swiper circular="true" :autoplay="true" class="swiper" :vertical="true">
 					<swiper-item v-for="(item,index) in changeRecords" :key="index" class="item">
 						<view class="record">
-							{{dealTimeDiff(item.created_at)}}前{{item.ex_worker_name}}兑换了{{item.goods_name}}
+							<span class="span">{{dealTimeDiff(item.created_at)}}</span>
+							前{{item.ex_worker_name}}兑换了{{item.goods_name}}
 						</view>
 					</swiper-item>
 				</swiper>
@@ -217,7 +218,7 @@
 					},
 					fail() {
 						uni.redirectTo({
-							url: "/pages/login/login/login"
+							url: "/pages/login/authLogin/authLogin"
 						})
 					}
 				})
@@ -248,13 +249,11 @@
 							uni.setStorageSync("org_name", this.project.project_name)
 							uni.setStorageSync("org_id", this.project.id)
 							uni.setStorageSync("project_id", this.project.project_id)
+							this.initData()
 						}
 					}
-					if (this.role == 'WORKER') {
-						this.getGoodsList()
-						this.getMyScore()
-						this.getChangeRecord()
-					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			getGoodsList() {
@@ -279,6 +278,8 @@
 							}
 						})
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			add0(text) {
@@ -358,7 +359,9 @@
 					}
 				}).then((result) => {
 					if (result.code == 0) {
-						this.banners = result.data.list
+						if (result.data.list.length > 0) {
+							this.banners = result.data.list
+						}
 					} else {
 						this.$toast.showToast(result.msg)
 					}
@@ -510,20 +513,7 @@
 						if (!this.project_id) {
 							this.loadProject()
 						} else {
-							if (this.role == 'WORKER') {
-								this.project_id = this.userInfo.worker.projectId
-								this.getGoodsList()
-								this.getMyScore()
-								this.getChangeRecord()
-								uni.setStorageSync("org_no", this.userInfo.user.org_no)
-								uni.setStorageSync("org_name", this.userInfo.currentProject.projectName)
-								this.city = this.userInfo.currentProject.city
-								this.getWeather()
-							}
-						}
-						if (this.role != 'VISITOR') {
-							this.getNews()
-							this.getBanners()
+							this.initData()
 						}
 					} else {
 						this.$toast.showToast(result.msg)
@@ -532,6 +522,22 @@
 					this.$toast.showToast(err.msg)
 				})
 			},
+			initData() {
+				if (this.role == 'WORKER') {
+					this.project_id = this.userInfo.worker.projectId
+					this.getGoodsList()
+					this.getMyScore()
+					this.getChangeRecord()
+					uni.setStorageSync("org_no", this.userInfo.user.org_no)
+					uni.setStorageSync("org_name", this.userInfo.currentProject.projectName)
+					this.city = this.userInfo.currentProject.city
+					this.getWeather()
+				}
+				if (this.role != 'VISITOR') {
+					this.getNews()
+					this.getBanners()
+				}
+			},
 			toLogin: function() {
 				uni.navigateTo({
 					url: "/pages/login/login/login"
@@ -845,7 +851,7 @@
 			display: flex;
 			flex-direction: row;
 			border-radius: 30rpx;
-			margin: 30rpx 30rpx 20rpx 30rpx;
+			margin: 30rpx 30rpx 0 30rpx;
 			background-color: #FFFFFF;
 			padding: 16rpx 30rpx;
 			align-items: center;
@@ -900,7 +906,7 @@
 			padding: 30rpx;
 			background-color: #FFFFFF;
 			border-radius: 30rpx;
-			margin: 0 30rpx;
+			margin: 30rpx 30rpx 0 30rpx;
 
 			.tab-content {
 				display: flex;
@@ -1197,7 +1203,12 @@
 							white-space: nowrap;
 							text-overflow: ellipsis;
 							font-size: 24rpx;
-							color: #FFAA44;
+							color: #333333;
+
+							.span {
+								font-size: 24rpx;
+								color: #FFAA44;
+							}
 						}
 					}
 				}

pages/login/login/login.vue

@@ -71,7 +71,7 @@
 		},
 		methods: {
 			register: function() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/login/register/register"
 				})
 			},

pages/login/register/register.vue

@@ -136,6 +136,8 @@
 					} else {
 						this.$toast.showToast(result.msg)
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			login: function(account, password) {
@@ -173,6 +175,8 @@
 							icon: 'none'
 						})
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			bindLogin(account, password) {
@@ -206,6 +210,8 @@
 							icon: 'none'
 						})
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			get_key(data) {
@@ -229,6 +235,8 @@
 							icon: 'none'
 						})
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			toLogin: function() {
@@ -237,8 +245,8 @@
 						url: "/pages/login/bindLogin/bindLogin?unique_token=" + his.unique_token
 					})
 				} else {
-					uni.redirectTo({
-						url: "/pages/login/login/login"
+					uni.navigateBack({
+						delta: 1
 					})
 				}
 			},
@@ -277,6 +285,8 @@
 							icon: 'none'
 						})
 					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
 				})
 			},
 			timeDown(num) {