Merge branch 'fix/0714-ch' into msb_test

.env.test

@@ -1,3 +1,3 @@
-VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.com
-VUE_APP_STATIC_URL =  https://k8s-shop-app.mashibing.com
+VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.cn
+VUE_APP_STATIC_URL =  https://k8s-shop-app.mashibing.cn
 VUE_APP_IM_URL = wss://k8s-horse-gateway.mashibing.cn

README.md

@@ -5,28 +5,18 @@
  * @LastEditTime: 2022-05-23 21:18:34
  * @Description: file content
 -->
-
 # shopping-app
 
 严选移动端
 
-## 前置环境
-
-由于项目依赖问题，开发 `node` 版本必须是 `14` or `16`。
-
-如果想安装多个版本，可以通过使用 `nvm` 进行版本管理。然具体安装可以参考下面教程
 
-[window install nvm](https://juejin.cn/post/7074108351524634655)
-[mac install nvm](https://juejin.cn/post/7206882855200047161)
 
-## 公共方法 utils
-
-- 公共方法统一放置 utils 文件夹内，可以按分类建方法文件 如：验证类 verify.js 请求类 request.js；
+## 公共方法utils
+- 公共方法统一放置utils文件夹内，可以按分类建方法文件 如：验证类verify.js 请求类request.js；
 - 所有公共方法采用大驼峰命名法
-- 所有的方法都从 index.js 输出，引入时统一引入 index，不允许直接引入方法文件
+- 所有的方法都从index.js输出，引入时统一引入index，不允许直接引入方法文件
 - 所有方法文件如果导出的是多个方法，不允许在定义方法时导出，必须在文件底部一一导出，并附上方法简单的注释
-
-```js
+``` js
 // 正确
 import {Req, IsPhone} from '@/common/utils';
 
@@ -49,20 +39,17 @@ export const IsPhone = (str) => {....}
 export const IsEmail = (str) => {....}
 
 ```
-
 ## 组件
+- 请务必使用easycom模式引入第三方组件
+- 根目录的components 只放置真正的组件，某个页面的业务模块应该在pages的相应目录下新建components目录放置
+- 所有的自定义组件文件名以大驼峰命名，且在templet中使用也用大驼峰形式使用
 
-- 请务必使用 easycom 模式引入第三方组件
-- 根目录的 components 只放置真正的组件，某个页面的业务模块应该在 pages 的相应目录下新建 components 目录放置
-- 所有的自定义组件文件名以大驼峰命名，且在 templet 中使用也用大驼峰形式使用
 
 ## 请求
-
 - 所有请求方法命名以（Api+请求类型+具体方） 法命名
-- 所有请求使用 ToAsyncAwait 包裹
-- 不允许使用 try catch 和 then 处理返回结果
-
-```js
+- 所有请求使用ToAsyncAwait 包裹
+- 不允许使用try catch 和 then 处理返回结果
+``` js
 // 使用示例
 	// xxapi.js
 	import {ToAsyncAwait, ReqestTk} from '@/common/utils'
@@ -84,8 +71,6 @@ export const IsEmail = (str) => {....}
 	}
 
 ```
-
 ## 图片
-
-- 按 pages 目录结果放置图片
-- 有公共使用的图片请放到 static/common 文件夹内
+- 按pages目录结果放置图片
+- 有公共使用的图片请放到static/common文件夹内

package.json

@@ -77,36 +77,35 @@
     "@dcloudio/uni-quickapp-webview": "^2.0.1-34720220422002",
     "@dcloudio/uni-stat": "^2.0.1-34720220422002",
     "@vue/shared": "^3.0.0",
-    "caniuse-lite": "^1.0.30001640",
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",
+    "regenerator-runtime": "^0.12.1",
+    "vue": "^2.6.11",
+    "vuex": "^3.2.0",
     "js-util-all": "^1.0.6",
     "mp-html": "^2.2.2",
-    "regenerator-runtime": "^0.12.1",
     "uni-read-pages": "^1.0.5",
     "uni-simple-router": "^2.0.7",
-    "uview-ui": "^2.0.29",
-    "vue": "^2.6.11",
-    "vuex": "^3.2.0"
+    "uview-ui": "^2.0.29"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",
     "@dcloudio/types": "^2.6.7",
-    "@dcloudio/uni-automator": "2.0.2-4010520240507001",
-    "@dcloudio/uni-cli-i18n": "2.0.2-4010520240507001",
-    "@dcloudio/uni-cli-shared": "2.0.2-4010520240507001",
-    "@dcloudio/uni-migration": "2.0.2-4010520240507001",
-    "@dcloudio/uni-template-compiler": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-uni": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-4010520240507001",
-    "@dcloudio/webpack-uni-mp-loader": "2.0.2-4010520240507001",
-    "@dcloudio/webpack-uni-pages-loader": "2.0.2-4010520240507001",
+    "@dcloudio/uni-automator": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-shared": "^2.0.1-34720220422002",
+    "@dcloudio/uni-migration": "^2.0.1-34720220422002",
+    "@dcloudio/uni-template-compiler": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-34720220422002",
     "@vue/cli-plugin-babel": "~4.5.15",
     "@vue/cli-service": "~4.5.15",
-    "babel-plugin-import": "1.13.8",
-    "cross-env": "7.0.3",
-    "jest": "25.5.4",
+    "babel-plugin-import": "^1.11.0",
+    "cross-env": "^7.0.2",
+    "jest": "^25.4.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
     "postcss-comment": "^2.0.0",

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "马士兵严选",
-    "appid" : "__UNI__5FEB250",
+    "appid" : "__UNI__3FB31B6",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : "100",
@@ -40,14 +40,10 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21
+                ]
             },
             /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
+            "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
@@ -64,10 +60,34 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "src/static/app-icon/72.png",
-                    "xhdpi" : "src/static/app-icon/96.png",
-                    "xxhdpi" : "src/static/app-icon/144.png",
-                    "xxxhdpi" : "src/static/app-icon/192.png"
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
                 }
             }
         }