多语言设置

pageTwo/count/search.vue

@@ -751,7 +751,7 @@
 			}
 
 			view {
-				width: calc(100% - 90rpx);
+				width: calc(100% - 130rpx);
 			}
 
 			text {

pageTwo/login/login.vue

@@ -266,6 +266,7 @@
 
 			view {
 				display: flex;
+				align-items: center;
 			}
 		}
 	}

pages/me/me.vue

@@ -41,15 +41,6 @@
 				</view>
 				<uni-icons type="forward" size="20" color="#666"></uni-icons>
 			</view>
-
-			<!-- #ifdef APP-PLUS -->
-			<view class="item" @click="navTo('/pageTwo/me/about')">
-				<view class="left">
-					<image src="/static/27.png" mode=""></image>{{$t('titleAboutUs')}}
-				</view>
-				<uni-icons type="forward" size="20" color="#666"></uni-icons>
-			</view>
-			<!--  #endif -->
 			<view class="item">
 				<view class="left">
 					<image src="/static/12.png" mode=""></image>{{$t('titleLanguage')}}
@@ -64,6 +55,12 @@
 					</picker>
 				</view>
 			</view>
+			<view class="item" @click="navTo('/pageTwo/me/about')">
+				<view class="left">
+					<image src="/static/27.png" mode=""></image>{{$t('titleAboutUs')}}
+				</view>
+				<uni-icons type="forward" size="20" color="#666"></uni-icons>
+			</view>
 			<!-- <view class="item"
 				@click="navTo('/pageTwo/webview/webview?url=' + configInfo.business_cooperation.jump_url)">
 				<view class="left">

unpackage/dist/dev/mp-weixin/pageTwo/count/search.wxss

@@ -209,7 +209,7 @@
   border: 1px solid #f7f7f7;
 }
 .search_list .search_list_item view.data-v-d4f38c70 {
-  width: calc(100% - 90rpx);
+  width: calc(100% - 130rpx);
 }
 .search_list .search_list_item text.data-v-d4f38c70 {
   width: 100%;

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxss

@@ -206,6 +206,7 @@
 }
 .language picker view.data-v-111bb4d3 {
   display: flex;
+  align-items: center;
 }
 .wxbtn.data-v-111bb4d3 {
   width: 100%;

unpackage/dist/dev/mp-weixin/pages/me/me.js

@@ -129,8 +129,9 @@ var render = function () {
   var m1 = _vm.$t("infoPersonalProfile")
   var m2 = _vm.$t("titleHistory")
   var m3 = _vm.$t("titleLanguage")
-  var m4 = !_vm.token ? _vm.$t("msgLoginTips") : null
+  var m4 = _vm.$t("titleAboutUs")
-  var m5 = _vm.token ? _vm.$t("btnLogOut") : null
+  var m5 = !_vm.token ? _vm.$t("msgLoginTips") : null
+  var m6 = _vm.token ? _vm.$t("btnLogOut") : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -141,6 +142,7 @@ var render = function () {
         m3: m3,
         m4: m4,
         m5: m5,
+        m6: m6,
       },
     }
   )

unpackage/dist/dev/mp-weixin/pages/me/me.wxml

@@ -1 +1 @@
-<view class="content data-v-259fb574"><block wx:if="{{token}}"><view style="width:100%;" class="data-v-259fb574"><block wx:if="{{info.aud_id}}"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/setting/setting']]]]]}}" class="head data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="{{info.head_pic}}" class="data-v-259fb574"></image><text class="data-v-259fb574">{{info.nickname}}</text></view><view class="right data-v-259fb574"><uni-icons vue-id="8e55f700-1" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleUserEdit',['$event']]]]]}}" class="head data-v-259fb574" bindtap="__e"><text class="size22 data-v-259fb574">{{$root.m0}}</text></view></block></view></block><view class="list data-v-259fb574"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/userEdit']]]]]}}" class="item data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="/static/11.png" mode class="data-v-259fb574"></image>{{$root.m1+''}}</view><uni-icons vue-id="8e55f700-2" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/record']]]]]}}" class="item data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="/static/13.png" mode class="data-v-259fb574"></image>{{$root.m2+''}}</view><uni-icons vue-id="8e55f700-3" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view><view class="item data-v-259fb574"><view class="left data-v-259fb574"><image src="/static/12.png" mode class="data-v-259fb574"></image>{{$root.m3+''}}</view><view class="right data-v-259fb574"><picker mode="selector" range="{{languageList}}" range-key="name" value="{{levelInd}}" data-event-opts="{{[['change',[['changeClickLanguage',['$event']]]]]}}" bindchange="__e" class="data-v-259fb574"><view class="data-v-259fb574">{{''+languageList[levelInd].name+''}}<icon class="iconfont icon-arrow-down data-v-259fb574"></icon></view></picker></view></view></view><block wx:if="{{!token}}"><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="btn data-v-259fb574" bindtap="__e">{{$root.m4}}</view></block><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['handleOutLogin',['$event']]]]]}}" class="btn data-v-259fb574" bindtap="__e">{{$root.m5}}</view></block></view>
+<view class="content data-v-259fb574"><block wx:if="{{token}}"><view style="width:100%;" class="data-v-259fb574"><block wx:if="{{info.aud_id}}"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/setting/setting']]]]]}}" class="head data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="{{info.head_pic}}" class="data-v-259fb574"></image><text class="data-v-259fb574">{{info.nickname}}</text></view><view class="right data-v-259fb574"><uni-icons vue-id="8e55f700-1" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleUserEdit',['$event']]]]]}}" class="head data-v-259fb574" bindtap="__e"><text class="size22 data-v-259fb574">{{$root.m0}}</text></view></block></view></block><view class="list data-v-259fb574"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/userEdit']]]]]}}" class="item data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="/static/11.png" mode class="data-v-259fb574"></image>{{$root.m1+''}}</view><uni-icons vue-id="8e55f700-2" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/record']]]]]}}" class="item data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="/static/13.png" mode class="data-v-259fb574"></image>{{$root.m2+''}}</view><uni-icons vue-id="8e55f700-3" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view><view class="item data-v-259fb574"><view class="left data-v-259fb574"><image src="/static/12.png" mode class="data-v-259fb574"></image>{{$root.m3+''}}</view><view class="right data-v-259fb574"><picker mode="selector" range="{{languageList}}" range-key="name" value="{{levelInd}}" data-event-opts="{{[['change',[['changeClickLanguage',['$event']]]]]}}" bindchange="__e" class="data-v-259fb574"><view class="data-v-259fb574">{{''+languageList[levelInd].name+''}}<icon class="iconfont icon-arrow-down data-v-259fb574"></icon></view></picker></view></view><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/about']]]]]}}" class="item data-v-259fb574" bindtap="__e"><view class="left data-v-259fb574"><image src="/static/27.png" mode class="data-v-259fb574"></image>{{$root.m4+''}}</view><uni-icons vue-id="8e55f700-4" type="forward" size="20" color="#666" class="data-v-259fb574" bind:__l="__l"></uni-icons></view></view><block wx:if="{{!token}}"><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="btn data-v-259fb574" bindtap="__e">{{$root.m5}}</view></block><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['handleOutLogin',['$event']]]]]}}" class="btn data-v-259fb574" bindtap="__e">{{$root.m6}}</view></block></view>