Merge branch 'master' of iqiyoo:zhuishuyun_quickapp_front

src/assets/less/home.less

@@ -1,10 +1,10 @@
 .home-wrap {
   background-color: #fff;
   flex-direction: column;
-
+  padding-top: 20px;
   .type-bar {
     background-color: #fff;
-
+    
     .type-item {
       flex: 1;
       justify-content: center;

src/assets/less/my.less

@@ -1,43 +1,97 @@
 .user-wrap {
   flex-direction: column;
-
-  .user-info__wrap {
+  background-color: #f7f7f7;;
+  .my-collect{
+    width: 690px;
+    height: 150px;
     background-color: #fff;
-    padding: 40px 30px;
+    border-radius: 20px;
+    margin:200px auto 0;
+    padding: 30px;
+    justify-content: space-between;
     align-items: center;
+    .collect-content{
+      flex-direction: column;
+      justify-content: space-between;
+      height: 100%;
+      flex-grow:1;
+      .book_coin{
+        color: #333;
+      }
+      .collect-info{
+        
+        .vip-card{
+          background-color:#FFF7ED;
+          color:#CD8119;
+          border:1px solid rgba(205,129,25,1);
+          border-radius:22px;
+          padding: 4px 15px;
+          font-size:26px;
+          margin-left: 15px;
+        }
+        color: #000;
+        flex-direction: row;
+        .title{
+          font-size: 30px;
+          font-weight: bold;
+        }
 
+      }
+    }
+    .pay-btn{
+      width: 150px;
+      height: 60px;
+      background-color: #3AACFF;
+      border-radius: 30px;
+      align-items: center;
+      text-align: center;
+      color: #fff;
+      font-size: 30px;
+    }
+  }
+  .user-info__wrap {
+    background-color: #3AACFF;
+    padding: 40px 30px 80px 30px;
+    align-items: center;
+    margin-bottom: 140px;
+    width: 100%;
     image {
       width: 124px;
       height: 124px;
       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;
-    .vip-card{
-      background-color:#FFF7ED;
-      color:#CD8119;
-      border:2px solid rgba(205,129,25,1);
-      border-radius:22px;
-      padding: 4px 15px;
-      margin-top:8px;
-      font-size:26px;
+    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;
     }
+    
   }
   
 
   .operator-item__wrap {
     flex-direction: column;
-    border-top: 24px solid #f7f7f7;
-    
+    background-color: #fff;
     .operator-item {
       padding: 34px 26px;
       border-bottom: 2px solid #f7f7f7;

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;
 }

src/views/Home/index.ux

@@ -157,9 +157,9 @@ export default {
 <style lang="less">
 /* @import "../../assets/less/home.less"; */
 .home-wrap {
-  background-color: #fff;
+  background-color: #fff;  
   flex-direction: column;
-
+  padding-top: 20px;
   .entrance_block {
     width: 100%;
     padding: 30px;

src/views/Index/index.ux

@@ -214,13 +214,8 @@ export default {
       return true;
     }
   },
-  /**
-   * 当用户点击菜单按钮时触发，调用app中定义的方法showMenu
-   * 注意：使用加载器测试`创建桌面快捷方式`功能时，请先在`系统设置`中打开`应用加载器`的`桌面快捷方式`权限
-   */
-  onMenuPress() {
-    this.$app.$def.showMenu();
-  },
+
+
   changeShortCut() {
     this.showShortPop = false;
   },

src/views/My/index.ux

@@ -1,28 +1,53 @@
 <template>
   <div class="user-wrap">
-    <div class="user-info__wrap">
-      <image src="{{user.head_img}}"></image>
-      <div class="uesr-info__message"><text>ID：{{user.id}}<span if="haslogin && loginPhone">(Tel:{{loginPhone}})</span></text><text class="vip-card" if={{user.is_vip}}>免费阅读卡还剩{{user.vip_days}}</text></div>
-    </div>
+    <stack>
+      <div class="user-info__wrap">
+        <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 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>
+        <div class="my-collect">
+            <div class="collect-content">
+              <text class="collect-info"><span class="title">我的账户</span><span class="vip-card" if="{{user.is_vip}}">免费阅读卡还剩{{ user.vip_days }}天</span></text>
+              <text class="book_coin">书币:{{ user.balance }}</text>
+            </div>
+            <text  class="pay-btn" @click="pageChange('Pay')">充值</text>
+        </div>
+    </stack>
+   
+
     <div class="operator-item__wrap">
-      <div class="operator-item" @click="pageChange('Task')" if={{!user.is_vip}}>
+      <div
+        class="operator-item"
+        @click="pageChange('Task')"
+        if="{{!user.is_vip}}"
+      >
         <div class="item-name">
           <image src="../../assets/imgs/task.png"></image>
-          <text class="orange">做任务，得奖励</text>
+          <text class="orange">每日做任务，小说免费读</text>
         </div>
         <div class="info-text">
           <image class="arrow" src="../../assets/imgs/arrow-right.png"></image>
         </div>
       </div>
-      <div class="operator-item">
+      <!-- <div class="operator-item">
         <div class="item-name">
           <image src="../../assets/imgs/declining.png"></image>
-          <text><span>您还剩</span><span class="red">{{user.balance}}</span><span>书币</span></text>
+          <text
+            ><span>您还剩</span><span class="red">{{ user.balance }}</span
+            ><span>书币</span></text
+          >
         </div>
         <text class="operator-button" @click="pageChange('Pay')">
           充值
         </text>
-      </div>
+      </div> -->
       <div class="operator-item" @click="pageChange('Sign')">
         <div class="item-name">
           <image src="../../assets/imgs/sign.png"></image>
@@ -59,7 +84,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>
@@ -68,15 +93,15 @@
           <image class="arrow" src="../../assets/imgs/arrow-right.png"></image>
         </div>
       </div>
-       <div class="operator-item" @click="pageChange('Privacy')">
+      <div class="operator-item" @click="pageChange('Privacy')">
         <div class="item-name">
           <image src="../../assets/imgs/customer.png"></image>
           <text>隐私协议</text>
         </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>
@@ -120,12 +145,12 @@ export default {
   async getUser() {
     let user = await getUserInfo();
     var reg = /^(\d{3})\d*(\d{4})$/;
-    user.dtel = user.phone.replace(reg, '$1****$2')
+    if (user.phone) user.dtel = user.phone.replace(reg, '$1****$2')
     this.user = user;
     let haslogin = (await storage.get({ key: "hasLogin" })).data;
-    let loginPhone = (await storage.get({ key: "loginPhone" })).data;
+    this.loginPhone = (await storage.get({ key: "loginPhone" })).data;
     this.haslogin = haslogin;
-    this.loginPhone = loginPhone.replace(reg, '$1****$2');
+    if (!this.send_order_id) this.send_order_id = user.send_order_id;
   },
   async watchPropsChange(v) {
     if (v === 2) {
@@ -148,11 +173,11 @@ export default {
       return false;
     }
     if (page == 'Pay') {
-      if (this.send_order_id || this.user.phone) {
+      if (this.send_order_id || (this.haslogin && this.loginPhone)) {
         router.push({
           uri: `/views/${page}`
         })
-      } else{
+      } else {
         router.push({
           uri: `/views/Phone`
         })

src/views/Pay/index.ux

@@ -1,80 +1,106 @@
 <template>
-	<div class="pay-wrap">
-		<tabs class="wrap-relative">
-			<tab-content>
-				<div class="wrap-relative">
-					<div class="top-user__wrap">
-						<div class="user-balance">
-							<text>您的余额：</text>
-							<text class="balance">{{balance}}</text>
-							<text>书币</text>
-						</div>
-						<div class="chapter-cost" if="fee">
-							<text>当前需要消耗</text>
-							<text class="cost">{{fee}}</text>
-							<text>书币</text>
-						</div>
-					</div>
-					<div class="charge-wrap">
-						<div class="title">
-							<text class="border"></text>
-							<text>支付方式</text>
-						</div>
-						<div class="pay-type">
-							<block for="item in payType">
-								<div class="pay-type__item {{curPayType === item.value ? 'pay-type__item--cur' : ''}}" @click="changePayType(item)">
-									<image src="{{item.icon}}"></image>
-									<text>{{item.name}}</text>
-								</div>
-							</block>
-						</div>
-						<div class="recharge-list">
-							<block for="charge in rechargeList">
-								<stack class="stack-wrap" @click="changeCharge($idx)">
-									<div class="recharge-item {{curSelect === $idx ? 'recharge-item__select' : ''}}">
-										<text class="price {{curSelect === $idx ? 'price__select' : ''}}">{{charge.price}}</text>
-										<text class="send {{curSelect === $idx ? 'send__select' : ''}}">{{charge.text}}</text>
-										<div class="discount {{curSelect === $idx ? 'discount__select' : ''}}" if="charge.save_text">
-											<block if="!charge.is_year_order">
-												<text>省</text>
-											</block>
-											<block else>
-												<image src="../../assets/imgs/year_pay.png"></image>
-											</block>
-											<text class="discount-num {{curSelect === $idx ? 'discount-num__select' : ''}}">{{charge.save_text}}</text>
-										</div>
-									</div>
-									<image if="charge.today_special" class="recharge-recommend" src="../../assets/imgs/jinri.png"></image>
-								</stack>
-							</block>
-						</div>
-					</div>
-					<div class="notice-wrap">
-						<text class="title">提示：</text>
-						<text class="notice-item">1.书币属虚拟商品，一经购买不得退换</text>
-						<text class="notice-item">2.充值后书币到账可能有延迟，1小时内未到账请到个人中心联系客服</text>
-						<text class="notice-item">3.工作时间：周一 周四 周五 9:00-21:00，周二 周三 周六 周日 9:00-18:00</text>
-					</div>
-				</div>
-			</tab-content>
-		</tabs>
-		<div class="wrap-fixed">
-			<image src="../../assets/imgs/shadow.png" class="shadow"></image>
-			<div class="total-wrap">
-				<div class="total-cost">
-					<text>合计：{{total}}</text>
-					<text class="notice">选择充值金额（1元=100书币）</text>
-				</div>
-				<text class="go-to-pay" @click="toPay">立即充值</text>
-			</div>
-		</div>
-		<div class="loading-wrap" if="showLoading">
-			<div class="loading-content">
-				<progress type="circular"></progress>
-				<text class="loading-text">{{loadingText}}</text>
-			</div>
-		</div>
-	</div>
+  <div class="pay-wrap">
+    <tabs class="wrap-relative">
+      <tab-content>
+        <div class="wrap-relative">
+          <div class="top-user__wrap">
+            <div class="user-balance">
+              <text>您的余额：</text>
+              <text class="balance">{{ balance }}</text>
+              <text>书币</text>
+            </div>
+            <div class="chapter-cost" if="fee">
+              <text>当前需要消耗</text>
+              <text class="cost">{{ fee }}</text>
+              <text>书币</text>
+            </div>
+          </div>
+          <div class="charge-wrap">
+            <div class="title">
+              <text class="border"></text>
+              <text>支付方式</text>
+            </div>
+            <div class="pay-type">
+              <block for="item in payType">
+                <div
+                  class="pay-type__item {{curPayType === item.value ? 'pay-type__item--cur' : ''}}"
+                  @click="changePayType(item)"
+                >
+                  <image src="{{item.icon}}"></image>
+                  <text>{{ item.name }}</text>
+                </div>
+              </block>
+            </div>
+            <div class="recharge-list">
+              <block for="charge in rechargeList">
+                <stack class="stack-wrap" @click="changeCharge($idx)">
+                  <div
+                    class="recharge-item {{curSelect === $idx ? 'recharge-item__select' : ''}}"
+                  >
+                    <text
+                      class="price {{curSelect === $idx ? 'price__select' : ''}}"
+                      >{{ charge.price }}</text
+                    >
+                    <text
+                      class="send {{curSelect === $idx ? 'send__select' : ''}}"
+                      >{{ charge.text }}</text
+                    >
+                    <div
+                      class="discount {{curSelect === $idx ? 'discount__select' : ''}}"
+                      if="charge.save_text"
+                    >
+                      <block if="!charge.is_year_order">
+                        <text>省</text>
+                      </block>
+                      <block else>
+                        <image src="../../assets/imgs/year_pay.png"></image>
+                      </block>
+                      <text
+                        class="discount-num {{curSelect === $idx ? 'discount-num__select' : ''}}"
+                        >{{ charge.save_text }}</text
+                      >
+                    </div>
+                  </div>
+                  <image
+                    if="charge.today_special"
+                    class="recharge-recommend"
+                    src="../../assets/imgs/jinri.png"
+                  ></image>
+                </stack>
+              </block>
+            </div>
+          </div>
+          <div class="notice-wrap">
+            <text class="title">提示：</text>
+            <text class="notice-item">1.书币属虚拟商品，一经购买不得退换</text>
+            <text class="notice-item"
+              >2.充值后书币到账可能有延迟，1小时内未到账请到个人中心联系客服</text
+            >
+            <text class="notice-item"
+              >3.工作时间：周一 周四 周五 9:00-21:00，周二 周三 周六 周日
+              9:00-18:00</text
+            >
+          </div>
+        </div>
+      </tab-content>
+    </tabs>
+    <div class="wrap-fixed">
+      <image src="../../assets/imgs/shadow.png" class="shadow"></image>
+      <div class="total-wrap">
+        <div class="total-cost">
+          <text>合计：{{ total }}</text>
+          <text class="notice">选择充值金额（1元=100书币）</text>
+        </div>
+        <text class="go-to-pay" @click="toPay">立即充值</text>
+      </div>
+    </div>
+    <div class="loading-wrap" if="showLoading">
+      <div class="loading-content">
+        <progress type="circular"></progress>
+        <text class="loading-text">{{ loadingText }}</text>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -84,7 +110,7 @@ import storage from "@system.storage";
 
 import { getChargeList, getUserInfo, checkWxOrder } from "../../api";
 import { configWxPay, configAliPay } from "../../helper";
-import {  getAppConfig } from '../../api/utils.js';
+import { getAppConfig } from '../../api/utils.js';
 let getConfig;
 
 export default {
@@ -108,6 +134,7 @@ export default {
 		showLoading: false,
 		checked: false,
 		phone: '',
+		haslogin: '',
 		isVip: '',
 		last: null,
 		payType: [
@@ -147,7 +174,8 @@ export default {
 		this.balance = userinfo.balance;
 		this.send_order_id = userinfo.send_order_id;
 		this.checked = userinfo.is_check;
-		this.phone = userinfo.phone;
+		this.phone = (await storage.get({ key: "loginPhone" })).data;
+		this.haslogin = (await storage.get({ key: "hasLogin" })).data;
 		this.isVip = userinfo.is_vip;
 		if (userinfo.pay_mode_default == 'weixin') {
 			this.curPayType = 2;
@@ -174,7 +202,7 @@ export default {
 		this.initChargeList();
 	},
 	toPay() {
-		if (this.checked && !this.phone) {
+		if (!(this.send_order_id || (this.haslogin && this.loginPhone))) {
 			prompt.showDialog({
 				title: '友情提示',
 				message: '您还未绑定手机号，请绑定手机号后在进行相关操作',
@@ -270,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: '每日完成任务，可以免费获取书币~',