合并

src/app.ux

@@ -13,11 +13,12 @@ import "./helper/regenerator.js";
 import it from "./helper/interface.js";
 
 export default {
-  onCreate() {
+  async onCreate() {
     // 一进入程序就判断是否添加过主屏幕
     it.shortcut.systemPromptEnabled = false;
-    it.shortcut.hasInstalled({
+    await it.shortcut.hasInstalled({
       success: (ret) => {
+        console.log("is installed:", ret);
         if (!ret) this.$def.data.backClickCount = 0;
         else this.$def.data.backClickCount = 1;
       }
@@ -29,7 +30,7 @@ export default {
   data: {
     backClickCount: 0,
     cutomerQrcode: "",
-    weChat:"wxlxf1099"
+    weChat: "wxlxf1099"
   }
 };
 </script>

src/assets/less/detail.less

@@ -56,7 +56,7 @@
       }
 
       .read {
-        margin-left: 30px;
+        // margin-left: 30px;
         color: #fff;
         background-color: #ff6060;
       }

src/components/short/index.ux

@@ -6,43 +6,60 @@
 	</div>
 </template>
 <script>
+import shortcut from '@system.shortcut';
+import prompt from '@system.prompt';
 
 export default {
 	data: {
-		
+
 	},
 	onInit() {
-		
+
 	},
-	createShortcut(){
+	createShortcut() {
 		// 创建快捷方式
-    this.$app.$def.createShortcut()
+		shortcut.hasInstalled({
+			success: (ret) => {
+				if (!ret) {
+					shortcut.install({
+						message: "添加【追书云】到桌面，方便下次阅读",
+						success: () => {
+							prompt.showToast("添加成功！");
+							this.$emit("addshort", { installed: true });
+						},
+						fail: (code) => {
+							this.$emit("addshort", { installed: false });
+						}
+					})
+				}
+			}
+		})
 	}
 }
 </script>
 
 
 <style lang="less" scoped>
-	.short{
-		&-wrap{
-			position: fixed;
-			bottom: 140px;
-			height: 80px;
-			justify-content: center;
-			width: 100%;
-		}
-		&-content{
-			background-color: #EF5952;
-			border-radius: 40px;
-			width: 600px;
-			align-items: center;
-			justify-content: center;
-		}
-		&-text {
-			color:#fff;
-			font-size: 30px;
-			font-weight: bold;
-			text-align: center;
-		}
-	}
+.short {
+  &-wrap {
+    position: fixed;
+    bottom: 140px;
+    height: 80px;
+    justify-content: center;
+    width: 100%;
+  }
+  &-content {
+    background-color: #ef5952;
+    border-radius: 40px;
+    width: 600px;
+    align-items: center;
+    justify-content: center;
+  }
+  &-text {
+    color: #fff;
+    font-size: 30px;
+    font-weight: bold;
+    text-align: center;
+  }
+}
 </style>

src/helper/interface.js

@@ -15,13 +15,13 @@ const getDeviceInfo = () => {
   })
 }
 //获取是否创建图标
-const getShortCut = (fn) =>{
+const getShortCut = (fn) => {
   shortcut.hasInstalled({
     success: (ret) => {
-      if(!ret) fn();
+      fn(ret);
     }
   })
-  
+
 }
 // 判断用户是否创建图标
 const hasCreateShortCut = (isPayPage = false) => {

src/views/Detail/index.ux

@@ -13,7 +13,7 @@
           </div>
           <text class="words">字数：{{bookWordsFormat(book.book_word_count)}}</text>
           <div class="user-operator">
-            <text class="add" @click="addShelf">{{book.is_on_user_shelf ? '已加入' : '加入书架'}}</text>
+            <!-- <text class="add" @click="addShelf">{{book.is_on_user_shelf ? '已加入' : '加入书架'}}</text> -->
             <text class="read" @click="toRead(book.first_cid)">立即阅读</text>
           </div>
         </div>

src/views/Home/index.ux

@@ -21,7 +21,7 @@
         <swiper class="swipe-bar" autoplay="true" indicator="false">
           <block for="b in banner.books">
             <div class="swipe-item">
-              <image class="cover" src="{{b.cover_url}}"></image>
+              <image class="cover" src="{{b.banner_url}}"></image>
             </div>
           </block>
         </swiper>
@@ -110,6 +110,7 @@ export default {
     let ret = await getHomeList(sex);
     this.banner = ret.slice(0, 1)[0];
     this.list = ret.slice(1);
+    console.log(this.banner);
   }
 }
 </script>

src/views/Index/index.ux

@@ -29,7 +29,7 @@
     </div>
     <image src="../../assets/imgs/sign_show.png" class="sign-icon" @click="changeSignPop"> </image>
     <sign-page if="{{showSignPop}}"></sign-page>
-    <short-page if="{{showShortPop}}"></short-page>
+    <short-page if="{{showShortPop}}" @addshort="shortEnd"></short-page>
     <div class="stack-popup" @click="closeWrap" if="showPopup">
       <div class="customer-popup">
         <text class="title">联系客服</text>
@@ -91,22 +91,25 @@ export default {
   onInit() {
     this.$on('dispathEvt', this.changeSignPop);
     //今日已签到过不在弹框签到
+    console.log("app backClickCount", this.$app.$def.data.backClickCount);
     if (this.$app.$def.data.backClickCount === 0) {
       this.showShortPop = true;
     }
     this.getCoustom();
   },
-  onShow(){
-    it.getShortCut(()=>{
-      this.showShortPop = true;
-
+  onShow() {
+    it.getShortCut((value) => {
+      this.showShortPop = !value;
     })
   },
+  shortEnd(value) {
+    this.showShortPop = !value.detail.installed;
+  },
   onBackPress() {
     // 退出逻辑
     if (this.$app.$def.data.backClickCount === 0) {
       this.$app.$def.data.backClickCount++;
-      this.$app.$def.createShortcut()
+      this.$app.$def.createShortcut();
       return true;
     }
   },

src/views/My/index.ux

@@ -56,7 +56,8 @@
           <text>绑定手机</text>
         </div>
         <div class="info-text">
-          <text>绑定即送100书币</text>
+          <text if="{{!user.phone}}">绑定即送100书币</text>
+          <text else>已绑定手机号</text>
           <image class="arrow" src="../../assets/imgs/arrow-right.png"></image>
         </div>
       </div>
@@ -67,6 +68,7 @@
 <script>
 import router from "@system.router";
 import { getUserInfo } from "../../api/index";
+import prompt from '@system.prompt';
 export default {
   props: {
     tabindex: {
@@ -93,6 +95,12 @@ export default {
     this.$emit('customer');
   },
   pageChange(page) {
+    if (page == 'Phone' && this.user.phone) {
+      prompt.showToast({
+        message: '您已绑定过手机号'
+      })
+      return false;
+    }
     router.push({
       uri: `/views/${page}`
     })

src/views/Reader/index.ux

@@ -45,9 +45,14 @@ export default {
     }
   },
   onShow() {
+<<<<<<< HEAD
     it.getShortCut(() => {
       this.showShortPop = true;
 
+=======
+    it.getShortCut((value) => {
+      this.showShortPop = !value;
+>>>>>>> 49ca0d62c807be784a0d4361c8a8c08b956f9298
     })
   },
   addShelf() {