maple 11 months ago
parent
commit
585b08cde8
6 changed files with 183 additions and 159 deletions
  1. 2 1
      common/request/index-shop.js
  2. 2 1
      common/request/index.js
  3. 3 0
      common/wx/jswx.js
  4. 174 156
      manifest.json
  5. 2 1
      pages/goods.vue
  6. BIN
      static/wxbtn.png

+ 2 - 1
common/request/index-shop.js

@@ -21,7 +21,8 @@ shopHttp.setConfig(config => {
 	};
 	config.header = {
 		...config.header,
-		...systemInfoHeaders
+		...systemInfoHeaders,
+    'Content-Security-Policy': "frame-src 'self' https://*.qq.com webcompt:;"
 	};
 	return config;
 });

+ 2 - 1
common/request/index.js

@@ -21,7 +21,8 @@ http.setConfig(config => {
 	};
 	config.header = {
 		...config.header,
-		...systemInfoHeaders
+		...systemInfoHeaders,
+    'Content-Security-Policy': "frame-src 'self' https://*.qq.com webcompt:;"
 	};
 	return config;
 });

+ 3 - 0
common/wx/jswx.js

@@ -16,6 +16,9 @@ const requestFun = ({
       url: baseWxUrl + url, //仅为示例,并非真实接口地址。
       data: data,
       method: method,
+      header: {
+        'Content-Security-Policy': "frame-src 'self' https://*.qq.com webcompt:;"
+      },
       success: (res) => {
         resolve(res.data)
       },

+ 174 - 156
manifest.json

@@ -1,167 +1,185 @@
 {
-  "name": "宜格分享",
-  "appid": "__UNI__90011BF",
-  "description": "应用描述",
-  "versionName": "1.0.9",
-  "versionCode": 109,
-  "transformPx": false,
-  /* 5+App特有相关 */
-  "app-plus": {
-    "usingComponents": true,
-    "nvueCompiler": "uni-app",
-    "compilerVersion": 3,
-    "nvueLaunchMode": "fast",
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {
-      "OAuth": {},
-      "Payment": {},
-      "Push": {},
-      "Speech": {},
-      "VideoPlayer": {},
-      "Geolocation": {}
-    },
-    /* 应用发布信息 */
-    "distribute": {
-      /* android打包配置 */
-      "android": {
-        "permissions": [
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-        ]
-      },
-      /* ios打包配置 */
-      "ios": {
-        "UIBackgroundModes": ["audio"],
-        "urlschemewhitelist": ["baidumap", "iosamap"],
-        "dSYMs": false
-      },
-      /* SDK配置 */
-      "sdkConfigs": {
-        "speech": {
-          "ifly": {}
-        },
-        "geolocation": {
-          "baidu": {
-            "__platform__": ["ios", "android"],
-            "appkey_ios": "40f2ee33466749d47fd088fe81866f97",
-            "appkey_android": "40f2ee33466749d47fd088fe81866f97"
-          }
+    "name" : "宜格分享",
+    "appid" : "__UNI__90011BF",
+    "description" : "应用描述",
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "nvueLaunchMode" : "fast",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "share": {
-          "weixin": {
-            "appid": "wx54fd6fb89a3018e9",
-            "UniversalLinks": ""
-          }
+        "modules" : {
+            "OAuth" : {},
+            "Payment" : {},
+            "Push" : {},
+            "Speech" : {},
+            "VideoPlayer" : {},
+            "Geolocation" : {}
         },
-        "ad": {}
-      },
-      "orientation": ["portrait-primary"]
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  "quickapp-native": {
-    "icon": "/static/logo.png",
-    "package": "com.example.demo",
-    "features": [{
-      "name": "system.clipboard"
-    }]
-  },
-  "quickapp-webview": {
-    "icon": "/static/logo.png",
-    "package": "com.example.demo",
-    "minPlatformVersion": 1070,
-    "versionName": "1.0.0",
-    "versionCode": 100
-  },
-  /* 小程序特有相关 */
-  "mp-weixin": {
-    "appid": "",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "es6": true
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "UIBackgroundModes" : [ "audio" ],
+                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "speech" : {
+                    "ifly" : {}
+                },
+                "geolocation" : {
+                    "baidu" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "40f2ee33466749d47fd088fe81866f97",
+                        "appkey_android" : "40f2ee33466749d47fd088fe81866f97"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx54fd6fb89a3018e9",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "ad" : {}
+            },
+            "orientation" : [ "portrait-primary" ]
+        }
     },
-    "usingComponents": true,
-    "permission": {
-      "scope.userLocation": {
-        "desc": "演示定位能力"
-      }
-    }
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "h5": {
-    "template": "",
-    "router": {
-      "mode": "hash",
-      "base": "/yige-h5/"
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    "quickapp-native" : {
+        "icon" : "/static/logo.png",
+        "package" : "com.example.demo",
+        "features" : [
+            {
+                "name" : "system.clipboard"
+            }
+        ]
     },
-    "contentSecurityPolicy": {
-      "frame-src": "https://*.qq.com webcompt:"
+    "quickapp-webview" : {
+        "icon" : "/static/logo.png",
+        "package" : "com.example.demo",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 100
     },
-    "sdkConfigs": {
-      "maps": {
-        "qqmap": {
-          "key": ""
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "演示定位能力"
+            }
         }
-      }
     },
-    "async": {
-      "timeout": 20000
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "title": "宜格服务",
-    "devServer": {
-      "https": false,
-      "port": 8084
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "optimization": {
-      "treeShaking": {
-        "enable": true
-      }
+    "h5" : {
+        "template" : "",
+        "router" : {
+            "mode" : "hash",
+            "base" : "/yige-h5/"
+        },
+        "contentSecurityPolicy" : {
+            "frame-src" : "https://*.qq.com webcompt:"
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
+            }
+        },
+        "async" : {
+            "timeout" : 20000
+        },
+        "title" : "宜格服务",
+        "devServer" : {
+            "https" : false,
+            "port" : 8084,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://yigefuwuapp.ycbrain.com/shop-api",
+                    "changeOrigin" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                },
+                "/wxapi" : {
+                    "target" : "https://yigefuwuapp.ycbrain.com",
+                    "changeOrigin" : true,
+                    "pathRewrite" : {
+                        "^/wxapi" : ""
+                    }
+                }
+            }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        }
     }
-  }
-}
+}

+ 2 - 1
pages/goods.vue

@@ -147,7 +147,7 @@
     </view>
 
     <view class="wx-open">
-      <wx-open-launch-app id="launch-btn" appid="wx2cbf40f5fffa9e80" :extinfo="query" @launch="launchApp"
+      <wx-open-launch-app id="launch-btn" appid="wx2cbf40f5fffa9e80" :extinfo="queryPath" @launch="launchApp"
         @error="errorApp">
         <script type="text/wxtag-template">
           <style>
@@ -161,6 +161,7 @@
             }
           </style>
           <button class="btn">打开宜格服务APP</button>
+          <image src="/static/wxbtn.png" mode=""></image>
         </script>
       </wx-open-launch-app>
     </view>

BIN
static/wxbtn.png