第一版修改

src/api/fly.js

@@ -47,7 +47,7 @@ fly.interceptors.request.use(async config => {
       config.headers["X-Brand"] = qs.stringify(appDev);
       config.headers["X-Package"] = packages;
       config.headers["X-regId"] = regId;
-      config.headers["X-CodeVersion"] = '1.0.2';
+      config.headers["X-CodeVersion"] = '1.0.1';
       config.headers["X-pushId"] = push_id;
       config.headers["X-Provider"] = provider;
       if (sendOrderId) config.headers["send-order-id"] = sendOrderId;

src/assets/less/home.less

@@ -15,7 +15,7 @@
     }
 
     .cur {
-      color: #1082FE;
+      color: #FFD642;
       font-size: 36px;
       font-weight: bold;
     }
@@ -23,7 +23,7 @@
     .choose-bar {
       width: 38px;
       height: 4px;
-      background-color: #1082FE;
+      background-color: #FFD642;
       border-radius: 2px;
       margin-top: 10px;
     }

src/assets/less/index.less

@@ -27,7 +27,7 @@
       }
 
       .tabbar-name__cur {
-        color: #1082FE;
+        color: #FFD642;
       }
     }
   }

src/assets/less/my.less

@@ -1,11 +1,10 @@
 .user-wrap {
   flex-direction: column;
   background-color: #f7f7f7;
-
   .my_title {
     height: 112px;
     width: 100%;
-    background-color: #FFD642;
+    background-color: #fddc00;
     // position: fixed;
     // top: 0;
     // left: 0;
@@ -19,7 +18,6 @@
   }
   .bottom-info {
     margin: 0 0 40px 0;
-    width: 100%;
     justify-content: center;
     color: #999;
     font-size: 20px;
@@ -27,71 +25,75 @@
       padding: 0 20px;
     }
   }
-
   .my-collect {
-    flex-direction: column;
-    width: 690px;
-    height: 500px;
-    background: linear-gradient(to bottom, #f7f7f7 20%, #fff 0);
-    border-radius: 40px;
-    margin: 120 auto 50;
+    width: 720px;
+    height: 150px;
+    background: linear-gradient(to right, #251912, #57352f);
+    border-radius: 20px;
+    margin: 200px auto 0;
     padding: 30px;
     justify-content: space-between;
     align-items: center;
-    .my-collect-wrap {
+    .collect-content {
+      flex-direction: column;
       justify-content: space-between;
-      width: 100%;
-      .collect-content {
+      height: 100%;
+      flex-grow: 1;
+
+      .coin_wrap {
         flex-direction: column;
-        justify-content: space-between;
-        height: 100%;
-        flex-grow: 1;
-        .book_coin {
-          color: #333;
+        .coin {
+          display: inline-block;
+          color: #fddc00;
         }
-        .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 {
-            margin: 10px 0;
-            font-size: 30px;
-            font-weight: bold;
-          }
+        text {
+          color: white;
         }
       }
-      .pay-btn {
-        width: 150px;
-        height: 60px;
+      .arrow {
+        float: right;
+      }
+      .collect-info {
+        .vip-card {
+          color: #f8e2b2;
+          border: 1px solid rgba(205, 129, 25, 1);
+          border-radius: 22px;
+          padding: 4px 15px;
+          font-size: 26px;
+          margin-left: 15px;
+        }
         color: white;
-        background-color: #1082fe;
-        border-radius: 30px;
-        align-items: center;
-        text-align: center;
-        font-size: 30px;
+        flex-direction: row;
+        .title {
+          font-size: 30px;
+          font-weight: bold;
+        }
       }
     }
+    .pay-btn {
+      width: 150px;
+      height: 60px;
+      background-color: #f8e2b2;
+      border-radius: 30px;
+      align-items: center;
+      text-align: center;
+      color: #0a0e2e;
+      font-size: 30px;
+    }
   }
   .user-info__wrap {
+    background-color: #fddc00;
+    padding: 40px 30px 80px 30px;
     align-items: center;
+    margin-bottom: 140px;
     width: 100%;
-    flex-direction: column;
-    text-align: center;
-    margin: 0 auto;
     image {
       width: 124px;
       height: 124px;
       border-radius: 80px;
       border-color: #ebebeb;
       border-width: 2px;
+      margin-right: 20px;
     }
 
     text {
@@ -103,115 +105,95 @@
     flex-direction: column;
     justify-content: space-around;
     height: 124px;
-    margin: 20px auto 0;
-    .user_id {
-      color: #999999;
-      font-size: 30px;
-    }
     .un-Login {
-      margin: 0 auto;
-      color: white;
       width: 120px;
       height: 50px;
-      background-color: #1082fe;
+      background-color: #fddc00;
       border-radius: 30px;
-      border: 1px solid #ffd56f;
+      border: 1px solid #ffffff;
       justify-content: center;
       align-items: center;
       text-align: center;
       font-size: 24px;
     }
   }
-  .first_item {
-    height: 200px;
-    margin: 0 30px 30px;
-
-    image {
-      border-radius: 20px;
-      height: 198px;
-      width: 690px;
-    }
-
-    // text {
-    //   font-size: 30px;
-    //   color: #545454;
-    //   .red {
-    //     color: #ef5952;
-    //   }
-    // }
-
-    // .info-text {
-    //   align-items: center;
 
-    //   text {
-    //     font-size: 24px;
-    //     color: #999;
-    //     margin-right: 20px;
-    //   }
-
-    //   .arrow {
-    //     width: 12px;
-    //   }
-    // }
-  }
   .operator-item__wrap {
     width: 100%;
     flex-direction: column;
-    padding: 0 25px;
+    background-color: #fff;
     margin-bottom: 220px;
-    .operator-item_wrap_content {
-      flex-direction: column;
-      background-color: #fff;
-      border-radius: 10px;
-
-      .operator-item {
-        padding: 34px 26px;
-        border-bottom: 2px solid #f7f7f7;
-        justify-content: space-between;
-        align-items: center;
-
-        .item-name {
-          flex: 1;
-          .orange {
-            color: #cd8119;
-          }
+    .task_wrap {
+      height: 200px;
+      background-color: #f2f2f2;
+      .task_wrap_item {
+        background-color: white;
+        width: 100%;
+        height: 90%;
+        .operator-item {
+          flex-direction: column;
+          text-align: center;
+          margin: 0 auto;
           image {
-            width: 40px;
-            margin-right: 40px;
+            height: 50px;
+            width: 50px;
           }
-
           text {
-            font-size: 30px;
-            color: #545454;
-            .red {
-              color: #ef5952;
-            }
+            font-size: 28px;
+            margin-top: 5px;
+            color: #333333;
+            font-weight: 400;
           }
         }
+      }
+    }
+    .operator-item {
+      padding: 34px 26px;
+      border-bottom: 2px solid #f7f7f7;
+      justify-content: space-between;
+      align-items: center;
 
-        .info-text {
-          align-items: center;
+      .item-name {
+        flex: 1;
+        .orange {
+          color: #cd8119;
+        }
+        image {
+          width: 40px;
+          margin-right: 40px;
+        }
 
-          text {
-            font-size: 24px;
-            color: #999;
-            margin-right: 20px;
+        text {
+          font-size: 30px;
+          color: #545454;
+          .red {
+            color: #ef5952;
           }
+        }
+      }
 
-          .arrow {
-            width: 12px;
-          }
+      .info-text {
+        align-items: center;
+
+        text {
+          font-size: 24px;
+          color: #999;
+          margin-right: 20px;
         }
-        .operator-button {
-          background-color: #ef5952;
-          width: 116px;
-          height: 44px;
-          border-radius: 4px;
-          color: #fff;
-          text-align: center;
-          font-size: 26px;
+
+        .arrow {
+          width: 12px;
         }
       }
+      .operator-button {
+        background-color: #ef5952;
+        width: 116px;
+        height: 44px;
+        border-radius: 4px;
+        color: #fff;
+        text-align: center;
+        font-size: 26px;
+      }
     }
   }
 

src/components/yinsi/policy.ux

@@ -4,10 +4,10 @@
         <text
           style="font-weight: 400;margin-top: 40px;text-indent:60px;margin-left: 20px;margin-right: 20px"
           >欢迎使用琥珀阅读~你需要阅读并同意<a
-            style="color: #3AACFF;"
+            style="color: #fddc00;"
             @click="gotoPrivacy"
             >《隐私政策》</a
-          >和<a style="color: #3AACFF;" @click="gotoRouter">《用户协议》</a
+          >和<a style="color: #fddc00;" @click="gotoRouter">《用户协议》</a
           >方可使用琥珀阅读提供的阅读服务，是否同意?</text
         >
 
@@ -47,7 +47,7 @@ export default {
   gotoPrivacy() {
     webview.loadUrl({
       url:
-        'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/hait_privacy.htm',
+        'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/hupoyuedu-privacy.htm',
       showloadingdialog: true
     })
   }
@@ -74,7 +74,7 @@ export default {
   height: 80px;
   text-align: center;
   border-bottom-right-radius: 30px;
-  background-color: #3AACFF;
+  background-color: #fddc00;
   color: white;
 }
 .cancel {

src/views/Free/index.ux

@@ -186,7 +186,7 @@ export default {
     }
 
     .cur {
-      color: #1082FE;
+      color: #FFD642;
       font-size: 36px;
       font-weight: bold;
     }
@@ -194,7 +194,7 @@ export default {
     .choose-bar {
       width: 38px;
       height: 4px;
-      background-color: #1082FE;
+      background-color: #FFD642;
       border-radius: 2px;
       margin-top: 10px;
     }

src/views/My/index.ux

@@ -1,9 +1,9 @@
 <template>
   <div class="user-wrap">
     <div class="my_title"><text>我的</text></div>
-    <list>
-      <list-item type="mycollect">
-        <div class="my-collect">
+    <list style="width:100%">
+      <list-item type="mycollect" style="height:340px">
+        <stack style="background-color:#fddc00">
           <div class="user-info__wrap">
             <image
               src="../../assets/imgs/user_login.png"
@@ -15,114 +15,124 @@
                 >书友{{ user.id }}</text
               >
               <text class="un-Login" else>未登录</text>
-              <text class="user_id">ID：{{ user.id }}</text>
+              <text>ID：{{ user.id }}</text>
               <!-- <text class="vip-card" if="{{user.is_vip}}">免费阅读卡还剩{{ user.vip_days }}</text> -->
             </div>
           </div>
-          <div class="my-collect-wrap">
+          <div class="my-collect">
+            <!-- if="{{user.is_vip}}" -->
             <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 class="coin_wrap">
+                <div>
+                  <!--  -->
+                  <text>我的账户</text>
+                  <text class="collect-info"
+                    ><span class="vip-card" if="{{user.is_vip}}"
+                      >免费阅读卡还剩{{ user.vip_days }}</span
+                    ></text
+                  >
+                </div>
+                <div style="padding:5px">
+                  <text class="book_coin">书币: </text>
+                  <text class="coin">{{ user.balance }}</text>
+                </div>
+              </div>
             </div>
             <text class="pay-btn" @click="pageChange('Pay')">充值</text>
           </div>
-        </div>
+        </stack>
       </list-item>
       <list-item type="myitem">
-        <div class="first_item" @click="pageChange('Task')">
-          <image src="../../assets/imgs/task.png"></image></div
-      ></list-item>
-      <list-item type="operatoritem">
         <div class="operator-item__wrap">
-          <div class="operator-item_wrap_content">
-            <div class="operator-item" @click="pageChange('Sign')">
-              <div class="item-name">
+          <div class="task_wrap">
+            <div class="task_wrap_item">
+              <div @click="pageChange('Task')" class="operator-item">
+                <image src="../../assets/imgs/task.png"></image>
+                <text>任务福利</text>
+              </div>
+              <div class="operator-item" @click="pageChange('Sign')">
                 <image src="../../assets/imgs/sign.png"></image>
                 <text>签到记录</text>
               </div>
-              <div class="info-text">
-                <image
-                  class="arrow"
-                  src="../../assets/imgs/arrow-right.png"
-                ></image>
-              </div>
-            </div>
-            <div class="operator-item" @click="pageChange('Recharge')">
-              <div class="item-name">
+              <div class="operator-item" @click="pageChange('Recharge')">
                 <image src="../../assets/imgs/recharge_record.png"></image>
                 <text>充值记录</text>
               </div>
-              <div class="info-text">
-                <image
-                  class="arrow"
-                  src="../../assets/imgs/arrow-right.png"
-                ></image>
-              </div>
-            </div>
-            <div class="operator-item" @click="pageChange('Consume')">
-              <div class="item-name">
+              <div class="operator-item" @click="pageChange('Consume')">
                 <image src="../../assets/imgs/consume_record.png"></image>
                 <text>消费记录</text>
               </div>
-              <div class="info-text">
-                <image
-                  class="arrow"
-                  src="../../assets/imgs/arrow-right.png"
-                ></image>
-              </div>
-            </div>
-            <div class="operator-item" @click="showCustomerQrcode">
-              <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 class="operator-item" @click="pageChange('Phone')">
-              <div class="item-name">
-                <image src="../../assets/imgs/binding.png"></image>
-                <text if="{{!(haslogin && loginPhone)}}"> 登录绑定</text>
-                <text else>退出登录</text>
-              </div>
-              <div class="info-text">
-                <text if="{{!(haslogin && loginPhone)}}"></text>
-                <text else>已绑定手机号</text>
-                <image
-                  class="arrow"
-                  src="../../assets/imgs/arrow-right.png"
-                ></image>
-              </div>
+          <div class="operator-item" @click="showCustomerQrcode">
+            <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>
-      </list-item>
+          <div class="operator-item" @click="pageChange('Agreement')">
+            <div class="item-name">
+              <image src="../../assets/imgs/Agreement.png"></image>
+              <text>用户协议</text>
+            </div>
+            <div class="info-text">
+              <image
+                class="arrow"
+                src="../../assets/imgs/arrow-right.png"
+              ></image>
+            </div>
+          </div>
+          <div class="operator-item" @click="pageChange('Privacy')">
+            <div class="item-name">
+              <image src="../../assets/imgs/Privacy.png"></image>
+              <text>隐私协议</text>
+            </div>
+            <div class="info-text">
+              <image
+                class="arrow"
+                src="../../assets/imgs/arrow-right.png"
+              ></image>
+            </div>
+          </div>
+          <div class="operator-item" @click="pageChange('Phone')">
+            <div class="item-name">
+              <image src="../../assets/imgs/binding.png"></image>
+              <text if="{{!(haslogin && loginPhone)}}"> 登录绑定</text>
+              <text else>退出登录</text>
+            </div>
+            <div class="info-text">
+              <text if="{{!(haslogin && loginPhone)}}"></text>
+              <text else>已绑定手机号</text>
+              <image
+                class="arrow"
+                src="../../assets/imgs/arrow-right.png"
+              ></image>
+            </div>
+          </div></div
+      ></list-item>
       <list-item type="bottominfo">
         <div class="bottom-info">
-          <text @click="pageChange('Agreement')">用户协议</text>
-          <text class="line">|</text>
-          <text @click="pageChange('Privacy')">隐私协议</text>
-          <text if="{{!send_order_id &&  haslogin && loginPhone}}" class="line"
-            >|</text
-          >
+          <!-- <text @click="pageChange('Agreement')">用户协议</text>
+      <text class="line">|</text>
+      <text @click="pageChange('Privacy')">隐私协议</text>
+      <text if="{{!send_order_id &&  haslogin && loginPhone}}" class="line"
+        >|</text
+      > -->
           <text
             if="{{!send_order_id && haslogin && loginPhone}}"
             @click="pageChange('Cancellation', { fee: user.balance })"
             >注销账号</text
           >
         </div>
-      </list-item>
-    </list>
+      </list-item></list
+    >
   </div>
 </template>
 
@@ -161,14 +171,14 @@ export default {
     }
   },
   async watchPropsChange(v) {
-    if (v === 4) {
+    if (v === 3) {
       //let s = (await storage.get({ key: 'send_order_id' })).data
       //if (s) this.send_order_id = s
       this.getUser()
     }
   },
   broadevt(evt) {
-    if (evt.detail.current == 4) {
+    if (evt.detail.current == 3) {
       this.getUser()
     }
   },
@@ -194,7 +204,7 @@ export default {
     if (page == 'Privacy') {
       webview.loadUrl({
         url:
-          'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/hait_privacy.htm',
+          'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/qapp_authority_detail.htm',
         showloadingdialog: true
       })
     } else {

src/views/Phone/index.ux

@@ -116,7 +116,7 @@ export default {
     if (page == 'Privacy') {
       webview.loadUrl({
         url:
-          'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/hait_privacy.htm',
+          'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/hupoyuedu-privacy.htm',
         showloadingdialog: true
       })
     } else {