Selaa lähdekoodia

部分UI修改

XiaBx 3 vuotta sitten
vanhempi
commit
abb14fc25a

BIN
src/assets/imgs/user_login.png


BIN
src/assets/imgs/user_logo.png


+ 34 - 7
src/assets/less/my.less

@@ -1,10 +1,24 @@
 .user-wrap {
   flex-direction: column;
-
+  background-color: #f7f7f7;;
   .user-info__wrap {
-    background-color: #fff;
-    padding: 40px 30px;
+    position: relative;
+    background-color: #3AACFF;
+    padding: 40px 30px 80px 30px;
     align-items: center;
+    margin-bottom: 200px;
+    
+    .my-collect{
+      width: 690px;
+      height: 150px;
+      background: #FFFFFF;
+      border-radius: 20px;
+      position: absolute;
+      left:50%;
+      margin-left: -345px;
+      bottom: -50px;
+      
+    }
 
     image {
       width: 124px;
@@ -12,16 +26,30 @@
       border-radius: 80px;
       border-color:#EBEBEB;
       border-width:2px;
-      margin-right: 40px;
+      margin-right: 20px;
     }
 
     text {
-      color: #333;
+      color: #fff;
       font-size: 30px;
     }
   }
   .uesr-info__message{
+    
     flex-direction: column;
+    justify-content: space-around;
+    height: 124px;
+    .un-Login{
+      width: 120px;
+      height: 50px;
+      background: #3AACFF;
+      border-radius: 30px;
+      border: 1px solid #FFFFFF;
+      justify-content: center;
+      align-items: center;
+      text-align: center;
+      font-size: 24px;
+    }
     .vip-card{
       background-color:#FFF7ED;
       color:#CD8119;
@@ -36,8 +64,7 @@
 
   .operator-item__wrap {
     flex-direction: column;
-    border-top: 24px solid #f7f7f7;
-    
+    background-color: #fff;
     .operator-item {
       padding: 34px 26px;
       border-bottom: 2px solid #f7f7f7;

+ 5 - 5
src/helper/index.js

@@ -19,11 +19,11 @@ export const pageLoad = (meta, fn, params) => {
 }
 // 支付配置
 export const configWxPay = async (params) => {
-  let payType = wxpay.getType();
-  let ret = null;
-  console.log(payType);
+  //let payType = wxpay.getType();
+  let ret = await useWxH5Pay(params);;
+
   // return;
-  switch (payType) {
+  /* switch (payType) {
     case "APP":
       try {
         ret = await useWxAppPay(params);
@@ -40,7 +40,7 @@ export const configWxPay = async (params) => {
       };
       break;
     default: ret = "app not install or wx pay is not avaliable";
-  }
+  } */
 
   return ret;
 }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 9
src/manifest.json


+ 17 - 10
src/views/My/index.ux

@@ -1,16 +1,23 @@
 <template>
   <div class="user-wrap">
     <div class="user-info__wrap">
-      <image src="{{user.head_img}}"></image>
+      <image src="../../assets/imgs/user_login.png" if="{{haslogin && loginPhone}}"></image>
+      <image src="../../assets/imgs/user_logo.png" else ></image>
       <div class="uesr-info__message">
-        <text
-          >ID:{{ user.id
-          }}<span if="haslogin && loginPhone">(Tel:{{ user.dtel }})</span></text
-        ><text class="vip-card" if="{{user.is_vip}}"
-          >免费阅读卡还剩{{ user.vip_days }}</text
-        >
+        <text class="user-name" if="{{haslogin && loginPhone}}">书友{{user.id}}</text>
+        <text class="un-Login" else>未登录</text>
+        <text>ID:{{ user.id }}</text>
+        <!-- <text class="vip-card" if="{{user.is_vip}}">免费阅读卡还剩{{ user.vip_days }}</text> -->
       </div>
+       <div class="my-collect">
+          <div class="">
+
+          </div>
+    </div>
     </div>
+
+   
+
     <div class="operator-item__wrap">
       <div
         class="operator-item"
@@ -73,7 +80,7 @@
           <image class="arrow" src="../../assets/imgs/arrow-right.png"></image>
         </div>
       </div>
-      <div class="operator-item" @click="pageChange('Agreement')">
+      <!-- <div class="operator-item" @click="pageChange('Agreement')">
         <div class="item-name">
           <image src="../../assets/imgs/customer.png"></image>
           <text>用户协议</text>
@@ -89,8 +96,8 @@
         </div>
         <div class="info-text">
           <image class="arrow" src="../../assets/imgs/arrow-right.png"></image>
-        </div>
-      </div>
+        </div> 
+      </div>-->
       <div class="operator-item" @click="pageChange('Phone')">
         <div class="item-name">
           <image src="../../assets/imgs/binding.png"></image>

+ 1 - 1
src/views/Pay/index.ux

@@ -298,7 +298,7 @@ export default {
 		//this.$app.$def.createShortcut(true);
 	},
 	onBackPress() {
-		if (!this.isVip && this.pay_back) {
+		if (this.pay_back) {
 			prompt.showDialog({
 				title: '温馨提示',
 				message: '每日完成任务,可以免费获取书币~',

+ 16 - 16
src/views/Reader/index.ux

@@ -172,13 +172,13 @@ export default {
           }
         }
       });
-    }else{
-       if (router.getLength() === 1) {
-            router.replace({ uri: "/views/Index" });
-            return true;
-          } else {
-            router.back()
-       }
+    } else {
+      if (router.getLength() === 1) {
+        router.replace({ uri: "/views/Index" });
+        return true;
+      } else {
+        router.back()
+      }
     }
   },
   async onShow() {
@@ -186,9 +186,9 @@ export default {
       this.showSetting = false;
       this.showShortPop = !value;
       this.hasShort = value;
-      if(value){
+      if (value) {
         this.$app.$def.data.backClickCount = 1
-      }else{
+      } else {
         this.$app.$def.data.backClickCount = 0
       }
     })
@@ -387,13 +387,13 @@ export default {
           }
         }
       });
-    }else{
-       if (router.getLength() === 1) {
-            router.replace({ uri: "/views/Index" });
-            return true;
-          } else {
-            router.back()
-       }
+    } else {
+      if (router.getLength() === 1) {
+        router.replace({ uri: "/views/Index" });
+        return true;
+      } else {
+        router.back()
+      }
     }