Merge branch 'release' into uat(dev)

# Conflicts:
#	src/api/index.js
#	src/views/deviceWithin/taskPhotoTaking.vue

.env.development

@@ -1,15 +1,12 @@
 # 页面标题
 VUE_APP_TITLE = 门店拜访
+ENV = 'release'
 
-# 开发环境配置
-ENV = 'development'
+#测试环境
 VUE_APP_Target=https://ssbsfatest.nipponpaint.com.cn
 VUE_APP_SSB_LINK=https://suishenbangtest.nipponpaint.com.cn
 VUE_APP_XD_LINK=http://b2btest.nipponpaint.com.cn
+VUE_APP_BASE_API = '/release/'
 
-# 门店拜访/开发环境
-#VUE_APP_BASE_API = '/dev-api/'
-VUE_APP_BASE_API = '/ssbsfa/'
-# VUE_APP_BASE_API = '/'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.gitignore

@@ -22,3 +22,4 @@ pnpm-debug.log*
 *.sln
 *.sw?
 /mobile/
+/releaseMobile/

README.md

@@ -15,14 +15,15 @@ npm install
 
 ```
 npm run test // 本地开发环境，为了跳过本地开发不能定位的问题，自定义定位坐标为当前位置
-npm run dev // 测试环境
+npm run dev // release 预发布环境
 npm run prod // 生产环境
 ```
 
 ### Compiles and minifies
 
 ```
-npm run build:dev  // 测试环境
+npm run build:test  // 测试环境
+npm run build:dev  // release 预发布环境
 npm run build:prod // 生产环境
 
 ```

package.json

@@ -6,6 +6,7 @@
     "dev": "vue-cli-service serve",
     "test": "vue-cli-service serve --mode test",
     "prod": "vue-cli-service serve --mode production",
+    "build:test": "vue-cli-service build --mode test",
     "build:dev": "vue-cli-service build --mode development",
     "build:prod": "vue-cli-service build",
     "lint": "vue-cli-service lint"
@@ -65,4 +66,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

src/components/storeCode.vue

@@ -93,7 +93,6 @@ export default {
       let wx = this.wx;
       let qiyeData;
       console.log(that.code);
-      debugger;
 
       const instance = axios.create();
       instance.defaults.headers.common['userId'] = localStorage.getItem('loginName');

src/router/index.js

@@ -19,7 +19,8 @@ const router = new VueRouter({
       return { x: 0, y: 0 };
     }
   },
-  base: '/mobile/',
+  base: process.env.NODE_ENV === 'development' ? '/releaseMobile/' : '/mobile/',
+  // base: '/mobile/',
   routes: [
     {
       path: '/',

src/views/deviceWithin/addStoreVisit111.vue

@@ -3018,7 +3018,6 @@ export default {
         }
       }
       if (val.type == 'E') {
-        debugger;
         this.collectionItemList[val.index].collectionOptionList[val.index1].collectionItems[
           val.index2
         ].collectionOptionList[val.index3].collectionItems[val.index4].collectionOptionList[

src/views/week/assignAwait/radioGroup copy.vue

@@ -40,7 +40,6 @@ export default {
   },
   methods: {
     getParentId(list, name) {
-      debugger;
       for (let i in list) {
         if (list[i].customerClueOptionId == name) {
           return [list[i]];
@@ -70,7 +69,7 @@ export default {
       }
       // 获取选中数据
       let activaRadio = this.clueOptionList[0].customerClueOptionList.find(
-        (val) => val.customerClueOptionId == name
+        (val) => val.customerClueOptionId == name,
       );
       console.log(this.parentOptionList);
       // 修改选中状态
@@ -79,7 +78,7 @@ export default {
 
       // 过滤未选中的数据
       let exceptItself = this.clueOptionList[0].customerClueOptionList.filter(
-        (val) => val.customerClueOptionId !== name
+        (val) => val.customerClueOptionId !== name,
       );
       // 删除未选中数据状态兄弟级和子级
       // console.log(exceptItself);

vue.config.js

@@ -7,9 +7,9 @@ const name = process.env.VUE_APP_TITLE || '门店拜访'; // 网页标题
 const port = 8888; // 端口
 module.exports = {
   parallel: false, // 强制关闭多线程构建
-  // publicPath: process.env.NODE_ENV === "production" ? "/mobile/" : "/",
-  publicPath: '/mobile/',
-  outputDir: 'mobile',
+  publicPath: process.env.NODE_ENV === 'development' ? '/releaseMobile/' : '/mobile/',
+  // publicPath: '/mobile/',
+  outputDir: process.env.NODE_ENV === 'development' ? 'releaseMobile' : 'mobile',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,