1.我的积分模块页面修改 2.登录页完善 3.注册页布局完善

locale/en.json

@@ -244,7 +244,7 @@
 	"page.invitefriendstoorder":"Invite friends to order",
 	"page.business":"Business",
 	"page.membercheckin":"Member check-in",
-	"page.login":"Log in",
+	"page.login":"User Log in",
 	"page.addressmanager":"Addresses",
 	"page.bankcard":"Bankcard",
 	"page.mycollection":"Collections",

locale/zh-Hans.json

@@ -244,7 +244,7 @@
 	"page.invitefriendstoorder":"邀请好友拼单",
 	"page.business":"商家",
 	"page.membercheckin":"会员签到",
-	"page.login":"登录",
+	"page.login":"用户登录",
 	"page.addressmanager":"地址管理",
 	"page.bankcard":"银行卡",
 	"page.mycollection":"我的收藏",

pages.json

@@ -416,7 +416,8 @@
 			"pages": [{
 					"path": "userModule/accountLogin",
 					"style": {
-						"navigationBarTitleText": "%page.login%"
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
@@ -532,7 +533,8 @@
 				}, {
 					"path": "userModule/register",
 					"style": {
-						"navigationBarTitleText": "%page.register%"
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{

pages_category_page1/integral/index.vue

@@ -337,8 +337,8 @@ page {
         font-size: 28rpx;
       }
       .icon {
-        width: 40rpx;
-        height: 40rpx;
+        width: 48rpx;
+        height: 48rpx;
         margin-right: 15rpx;
       }
       .detailIcon {

pages_category_page2/userModule/accountLogin.vue

@@ -2,17 +2,34 @@
   <!-- 登录 -->
   <view class="container flex-items-plus flex-column">
     <global-loading />
-    <view class="login-logoBox">
+<!--    <view class="login-logoBox">
       <image
           class="login-logo"
           src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"
       ></image>
+    </view>-->
+    <view
+      class="login-title"
+      :style="{'top': topHeight + 'px'}"
+    >
+      <view class="login-top-info">
+        <view class="backBox">
+          <image
+            src="@/static/images/temp/title_black_back.png"
+            class="back"
+            @click="back"
+          ></image>
+        </view>
+        <view class="fs32 font-color-252744">{{$t('page.login')}}</view>
+      </view>
     </view>
+    <image class="login-top" src="@/static/images/temp/login_top.png"/>
+    <image class="login-bottom" src="@/static/images/temp/login_bottom.png"/>
     <view class="iphoneNum-box flex-row-plus flex-items">
       <view style="margin-right: 30rpx">
         <image
             class="loginIcon"
-            src="https://ceres.zkthink.com/static/images/phone.png"
+            src="@/static/images/temp/login_phone_label.png"
         ></image>
       </view>
       <view>
@@ -30,7 +47,7 @@
         <view style="margin-right: 30rpx">
           <image
               class="loginIcon"
-              src="https://ceres.zkthink.com/static/images/code.png"
+              src="@/static/images/temp/login_psd_label.png"
           ></image>
         </view>
         <view>
@@ -81,11 +98,20 @@ export default {
       inviteSpell: {},
       inviteSpelltype: false,
       beforePage: undefined,
-      doubleBeforePage: undefined
+      doubleBeforePage: undefined,
+      topHeight: 10,
     }
   },
   mixins: [sendVerifyCode],
   onLoad(options) {
+    // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    this.topHeight = menuButtonInfo.top
+    // #endif
+    // #ifdef APP
+    this.topHeight = 50
+    // #endif
+
     if (options.inviteSpell == 1) {
       this.inviteSpelltype = true
       this.inviteSpell = uni.getStorageSync('inviteSpell');
@@ -252,6 +278,11 @@ export default {
         })
 
       }
+    },
+
+    // 返回上一级
+    back() {
+      uni.navigateBack()
     }
   }
 }
@@ -281,8 +312,9 @@ export default {
     border-radius: 50rpx;
 
     .loginIcon {
-      width: 32rpx;
-      height: 42rpx;
+      width: 44rpx;
+      height: 44rpx;
+      margin-top: 10rpx;
       margin-left: 47rpx;
     }
 
@@ -304,8 +336,9 @@ export default {
     align-items: center;
 
     .loginIcon {
-      width: 39rpx;
+      width: 44rpx;
       height: 44rpx;
+      margin-top: 10rpx;
       margin-left: 47rpx;
     }
 
@@ -343,4 +376,49 @@ export default {
     font-size: 32rpx;
   }
 }
+
+.login-title {
+  width: 100%;
+  position: fixed;
+  z-index: 99;
+  left: 0;
+
+  .login-top-info {
+    position: relative;
+    width: 100%;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .backBox {
+    position: absolute;
+    left: 10rpx;
+    top: 0rpx;
+
+    .back {
+      width: 20rpx;
+      height: 34rpx;
+      padding: 15rpx 10rpx;
+    }
+  }
+}
+
+.login-top{
+  width: 325rpx;
+  height: 263rpx;
+  position: fixed;
+  top: 0;
+  right: 0;
+}
+
+.login-bottom{
+  width: 646rpx;
+  height: 376rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+
 </style>

pages_category_page2/userModule/login.vue

@@ -4,6 +4,12 @@
 		<view class="login-logoBox">
 			<image class="login-logo" src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"></image>
 		</view>
+    <view class="lang-switch-fix">
+      <view class="lang-switch-box" @click="onLocaleChange">
+        <view class="txt">{{ applicationLocale == 'en' ? $t('navbar.english') : $t('navbar.chinese')}}</view>
+        <image src="@/static/images/temp/lang_label.png"/>
+      </view>
+    </view>
 		<view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26">
 			<text class="fs28 font-color-252744">{{ $t('client.logindesc')}}</text>
 			<text class="fs28 font-color-252744 mar-top-5">{{ $t('client.logindesc1')}}</text>
@@ -24,7 +30,7 @@
 			<text class="fs28 font-color-252744">{{ $t('client.noaccount')}}，</text>
 			<view class="fs28 font-color-f5be51" @click="goRegister">{{ $t('client.gotoregister')}}</view>
 		</view>
-		<view class="language" @click="onLocaleChange">{{ applicationLocale == 'en' ? $t('navbar.english') : $t('navbar.chinese')}}</view>
+<!--		<view class="language" @click="onLocaleChange">{{ applicationLocale == 'en' ? $t('navbar.english') : $t('navbar.chinese')}}</view>-->
 	</view>
 </template>
 
@@ -364,6 +370,26 @@
 			bottom: 5vh;
 		}
 	}
+
+  .lang-switch-fix{
+    position: fixed;
+    right: 90rpx;
+    top: 110rpx;
+  }
+  .lang-switch-box{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    .txt{
+      color: #252744;
+      font-size: 28rpx;
+      margin-right: 12rpx;
+    }
+    image{
+      width: 20rpx;
+      height: 13rpx;
+    }
+  }
 </style>
 <style scoped>
 	.loginWxBut::after {

pages_category_page2/userModule/register.vue

@@ -2,13 +2,30 @@
 <template>
 	<view class="container flex-items-plus flex-column">
 		<global-loading />
-		<view class="login-logoBox">
+<!--		<view class="login-logoBox">
 			<image class="login-logo" src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"></image>
-		</view>
-		<view class="mar-top-50">
+		</view>-->
+    <view
+      class="login-title"
+      :style="{'top': topHeight + 'px'}"
+    >
+      <view class="login-top-info">
+        <view class="backBox">
+          <image
+            src="@/static/images/temp/title_black_back.png"
+            class="back"
+            @click="back"
+          ></image>
+        </view>
+        <view class="fs32 font-color-252744">{{$t('page.register')}}</view>
+      </view>
+    </view>
+    <image class="login-top" src="@/static/images/temp/login_top.png"/>
+    <image class="login-bottom" src="@/static/images/temp/login_bottom.png"/>
+		<view style="margin-top: 200rpx">
 			<view class="iphoneNum-box flex-row-plus flex-items">
 				<view>
-					<image class="loginIcon" src="https://ceres.zkthink.com/static/images/phone.png"></image>
+					<image class="loginIcon" src="@/static/images/temp/login_phone_label.png"></image>
 				</view>
 				<view style="margin-left: 20rpx;">
 					<input v-model="phone" class="iphoneNum-inputbox" placeholder-class="iphoneNum-input" type="number"
@@ -18,7 +35,7 @@
 			<view class="flex-row-plus mar-top-30">
 				<view class="code-box">
 					<view>
-						<image class="loginIcon" src="https://ceres.zkthink.com/static/images/code.png"></image>
+						<image class="loginIcon" src="@/static/images/temp/login_psd_label.png"></image>
 					</view>
 					<view style="margin-left: 20rpx;">
 						<input v-model="RegisterQuery.code" :maxlength="4" class="codeNum-inputbox" placeholder-class="codeNum-input"
@@ -71,12 +88,19 @@
 					phone: "",
 					type: ""
 				},
-				agreement: false
+				agreement: false,
+        topHeight: 10,
 			}
 		},
 		mixins: [sendVerifyCode],
 		onLoad() {
-
+      // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+      this.topHeight = menuButtonInfo.top
+      // #endif
+      // #ifdef APP
+      this.topHeight = 50
+      // #endif
 		},
 		methods: {
 			// 注册账号
@@ -215,6 +239,11 @@
 					url: 'protocol?type=' + type
 				})
 			},
+
+      // 返回上一级
+      back() {
+        uni.navigateBack()
+      }
 		}
 	}
 </script>
@@ -241,9 +270,10 @@
       background: #f2f2f6;
       border-radius: 50rpx;
 			.loginIcon {
-				width: 32rpx;
-				height: 42rpx;
+				width: 44rpx;
+				height: 44rpx;
         margin-left: 47rpx;
+        margin-top: 10rpx;
 			}
 
 			input {
@@ -272,8 +302,9 @@
 			align-items: center;
 
 			.loginIcon {
-				width: 39rpx;
+				width: 44rpx;
 				height: 44rpx;
+        margin-top: 10rpx;
         margin-left: 47rpx;
 			}
 
@@ -344,4 +375,49 @@
 			}
 		}
 	}
+
+  .login-title {
+    width: 100%;
+    position: fixed;
+    z-index: 99;
+    left: 0;
+
+    .login-top-info {
+      position: relative;
+      width: 100%;
+      height: 60rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .backBox {
+      position: absolute;
+      left: 10rpx;
+      top: 0rpx;
+
+      .back {
+        width: 20rpx;
+        height: 34rpx;
+        padding: 15rpx 10rpx;
+      }
+    }
+  }
+
+  .login-top{
+    width: 325rpx;
+    height: 263rpx;
+    position: fixed;
+    top: 0;
+    right: 0;
+  }
+
+  .login-bottom{
+    width: 646rpx;
+    height: 376rpx;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+
 </style>