1

pages.json

@@ -69,8 +69,7 @@
     "path": "pages/mine/index",
     "style": {
       "navigationBarTitleText": "我的",
-	  "navigationStyle": "custom",
-	  "enablePullDownRefresh":true
+	  "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/avatar/index",

pages/mine/index.vue

@@ -431,7 +431,7 @@
 						console.log(versionNos, 'versionNos')
 						// console.log(res.data.path);
 						let filePath = res.data.path;
-						if (versionNos != versionCode) { //服务器返回1更新，0则不更新
+						if (Number(versionNos) > Number(versionCode)) { //服务器返回1更新，0则不更新
 							uni.showModal({
 								title: '提示',
 								content: '发现新版本，是否升级',

pages/mine/pwd/resetpwd.vue

@@ -7,6 +7,7 @@
       <uni-forms-item name="confirmPassword" label="确认密码">
         <uni-easyinput :inputBorder="false" type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
       </uni-forms-item>
+	  <view class="titico">*密码必须包含数字、大小写字母、特殊符号且大于8位</view>
       <view class="rbtn" @click="submit">提交</view>
     </uni-forms>
   </view>
@@ -31,9 +32,8 @@
                 errorMessage: '新密码不能为空',
               },
               {
-                minLength: 6,
-                maxLength: 20,
-                errorMessage: '长度在 6 到 20 个字符'
+                minLength: 8,
+                errorMessage: '长度大于8位'
               }
             ]
           },
@@ -86,6 +86,7 @@
   .pwd-retrieve-container {
     padding: 10rpx 36rpx;
   }
+  .titico{font-weight: 500;font-size: 24rpx;color: #FF6969;margin-top: 20rpx;}
   .pwd .rbtn{width: 100%;height: 98rpx;background: $com-cd3;border-radius: 49rpx;text-align: center;line-height: 98rpx;font-size: 32rpx;font-weight: bold;color: #FFFEFE;margin-top: 68rpx;}
   .pwd /deep/ .uni-forms-item{height: 126rpx;background: #FFFFFF;border-radius: 18rpx;margin-top: 30rpx;padding: 0 40rpx;box-sizing: border-box;display: flex;align-items: center;margin-bottom: 0;}
   .pwd /deep/ .uni-forms-item__label{font-size: 32rpx;font-weight: 500;

work/pages/business/add.vue

@@ -10,10 +10,14 @@
 					</view>
 				</block>
 				<block slot="right">
-					<view class="edit" @click="getGiveupFn">
+					<view class="edit" v-if="ftype" @click="getGiveupFn">
 						<image :src="feditimg"></image>
 						放弃编辑
 					</view>
+					<cover-view class="edit" v-else @click="getGiveupFn">
+						<cover-image :src="feditimg" @click.stop="getGiveupFn" class="img"></cover-image>
+						<cover-view @click.stop="getGiveupFn" class="txt">放弃编辑</cover-view>
+					</cover-view>
 				</block>
 			</uni-nav-bar>
 			<!-- 头部 -->
@@ -2282,6 +2286,8 @@
 }
 .edit{font-weight: 500;font-size: 26rpx;color: #FFFFFF;display: flex;align-items: center;
 	image{width: 24rpx;height: 26rpx;margin-right: 10rpx;}
+	.img{width: 24rpx;height: 26rpx;margin-right: 10rpx;}
+	.txt{font-weight: 500;font-size: 26rpx;color: #FFFFFF;}
 }
 .addbox{padding: 140rpx 0 136rpx;
 	.addtit{font-weight: bold;padding: 18rpx 34rpx;font-size: 26rpx;color: #666666;