XiaBx 3 роки тому
батько
коміт
352bf0e1d4

+ 2 - 1
package.json

@@ -12,7 +12,8 @@
     "gen": "node ./scripts/gen/index.js",
     "precommit-msg": "echo '🚧 start pre-commit checks ...' && exit 0",
     "prettier": "node ./scripts/selfCloseInputTag.js && prettier --write \"src/**/*.{js,ux,less,scss,css}\"",
-    "prettier-watcher": "onchange '**/*.md' \"src/**/**/*.{js,ux,less,scss,css}\" -- prettier --write {{changed}}"
+    "prettier-watcher": "onchange '**/*.md' \"src/**/**/*.{js,ux,less,scss,css}\" -- prettier --write {{changed}}",
+    "preinstall": "npx pm-keeper npm 6.14.13"
   },
   "devDependencies": {
     "@babel/runtime": "^7.12.5",

Різницю між файлами не показано, бо вона завелика
+ 6 - 3
src/manifest.json


+ 3 - 2
src/views/Catalog/index.ux

@@ -112,10 +112,10 @@ export default {
     if (!this.send_order_id && info.next_chapter_status == 2) {
       prompt.showDialog({
         title: '温馨提示',
-        message: `下一章即将消耗${info.next_price}书币哟~`,
+        message: `阅读本章将消耗${info.next_price}书币哟~`,
         buttons: [
           {
-            text: '阅读下一章',
+            text: '阅读章',
             color: '#EF5952'
           },
           {
@@ -124,6 +124,7 @@ export default {
           }
         ],
         success: function (data) {
+         
           if (data.index === 0) {
             router.replace({
               uri: "/views/Reader",

+ 16 - 8
src/views/My/index.ux

@@ -111,6 +111,7 @@
 import router from '@system.router'
 import { getUserInfo } from '../../api/index'
 import prompt from '@system.prompt'
+import webview from '@system.webview'
 import storage from '@system.storage'
 export default {
   props: {
@@ -170,7 +171,14 @@ export default {
           uri: `/views/Phone`
         })
       }
-    } else {
+    } if (page == 'Privacy') {
+      webview.loadUrl({
+        url: 'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/zsy_privacy.htm',
+        showloadingdialog: true
+      })
+    }
+
+    else {
       router.push({
         uri: `/views/${page}`,
         params: params ? params : {}
@@ -197,7 +205,7 @@ export default {
           color: '#9900FF'
         }
       ],
-      success: function(data) {
+      success: function (data) {
         if (data.index == 1) {
           prompt.showToast({
             message: '取消操作'
@@ -209,31 +217,31 @@ export default {
           console.log(data)
           storage.delete({
             key: 'hasLogin',
-            success: function(data) {
+            success: function (data) {
               self.getUser()
               console.log('handling success')
             },
-            fail: function(data, code) {
+            fail: function (data, code) {
               console.log(`handling fail, code = ${code}`)
             }
           })
           storage.delete({
             key: 'loginPhone',
-            success: function(data) {
+            success: function (data) {
               console.log('handling success')
             },
-            fail: function(data, code) {
+            fail: function (data, code) {
               console.log(`handling fail, code = ${code}`)
             }
           })
         }
       },
-      cancel: function() {
+      cancel: function () {
         prompt.showToast({
           message: '取消操作'
         })
       },
-      fail: function(data, code) {
+      fail: function (data, code) {
         console.log(`handling fail, code = ${code}`)
       }
     })

+ 13 - 5
src/views/Phone/index.ux

@@ -59,7 +59,7 @@ import { sendCode, userBind } from '../../api/index'
 import router from '@system.router'
 import prompt from '@system.prompt'
 import storage from '@system.storage'
-
+import webview from '@system.webview'
 export default {
   private: {
     hasSend: false,
@@ -70,7 +70,7 @@ export default {
     isOnsend: false,
     checked: false
   },
-  onInit() {},
+  onInit() { },
   async sendMsg() {
     if (this.isOnsend) {
       return false
@@ -113,9 +113,17 @@ export default {
     }, 1000)
   },
   pageChange(page) {
-    router.push({
-      uri: `/views/${page}`
-    })
+    if (page == 'Privacy') {
+      webview.loadUrl({
+        url: 'https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/zsy_privacy.htm',
+        showloadingdialog: true
+      })
+    } else {
+      router.push({
+        uri: `/views/${page}`
+      })
+    }
+
   },
   //绑定用户
   async bindUser() {

Різницю між файлами не показано, бо вона завелика
+ 5 - 330
src/views/Privacy/index.ux