Merge branch 'feature/ljq' into feature/qiao

package.json

@@ -6,10 +6,10 @@
   "private": true,
   "license": "GPL",
   "scripts": {
-    "dev": "cross-env BUILD_ENV=dev node build/dev-server.js",
+    "dev": "cross-env BUILD_ENV=development node build/dev-server.js",
     "local": "cross-env BUILD_ENV=development node build/dev-server.js",
     "build": "node build/build.js",
-    "build:dev": "cross-env BUILD_ENV=dev node build/build.js",
+    "build:dev": "cross-env BUILD_ENV=development node build/build.js",
     "build:test": "cross-env BUILD_ENV=test node build/build.js",
     "build:test2": "cross-env BUILD_ENV=test2 node build/build.js",
     "build:uat": "cross-env BUILD_ENV=uat node build/build.js",
@@ -62,7 +62,7 @@
     "cross-env": "^5.0.0",
     "css-loader": "^0.28.11",
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
+    "express": "^4.19.2",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "function-bind": "^1.0.2",
@@ -79,8 +79,8 @@
     "sass-loader": "^4.1.1",
     "scss": "^0.2.4",
     "scss-loader": "0.0.1",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.4",
+    "semver": "^5.7.2",
+    "shelljs": "^0.8.5",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "vue-lazyload": "^1.2.6",

src/utils/env-config.js

@@ -45,7 +45,8 @@ export const envConfig = {
     tEdUrl:"https://dev-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
   },
   dev: {
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    baseUrl: 'https://test1-sc.yunqueyi.com/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",

src/utils/index.js

@@ -228,6 +228,7 @@ export function getEndpoint() {
 
 // 根据不同环境，生成URL
 function getConfigByEnvType(urlType) {
+  // console.log(process.env.BUILD_ENV)
   return envConfig[process.env.BUILD_ENV][urlType]
 }
 

src/views/goods/create-good-new.vue

@@ -460,17 +460,33 @@
           <div class="inline">
             <el-form-item label="库存" prop="stock" class="required-label">
               <el-col :span="20">
-                <div class="stock-com">
+                <div style="display: flex">
+                  <div class="stock-com" style="width: 190px">
+                    <span
+                      class="sp sp-l"
+                      @click="changeStock(1)"
+                      :class="{ opac: formData.stock == 0 }"
+                      ><i class="el-icon-minus"></i
+                    ></span>
+                    <span class="sp sp-c">{{ formData.stock }}</span>
+                    <span class="sp sp-r" @click="changeStock(2)"
+                      ><i class="el-icon-plus"></i
+                    ></span>
+                  </div>
                   <span
-                    class="sp sp-l"
-                    @click="changeStock(1)"
-                    :class="{ opac: formData.stock == 0 }"
-                    ><i class="el-icon-minus"></i
-                  ></span>
-                  <span class="sp sp-c">{{ formData.stock }}</span>
-                  <span class="sp sp-r" @click="changeStock(2)"
-                    ><i class="el-icon-plus"></i
-                  ></span>
+                    v-if="isEdit"
+                    class="word-num"
+                    style="margin-left: 10px; width: 500px; color: #ec8851"
+                    >仓储可销售库存: {{ formData.storageSaleStock || "--" }};{{
+                      `{${
+                        (formData.storageFrozenGoodsIdList &&
+                          formData.storageFrozenGoodsIdList.join(";")) ||
+                        ""
+                      } }`
+                    }}共冻结库存:
+                    {{ formData.storageFrozenStock || "--" }};最大可用库存:
+                    {{ formData.availableStock || "--" }};</span
+                  >
                 </div>
                 <p class="error-message" v-if="!isgoodStock">库存不能为0</p>
               </el-col>
@@ -694,6 +710,9 @@
             ></el-input>
           </div>
         </div>
+        <div style="text-align: center; margin-top: 20px; color: #ec8851">
+          最大可用库存：{{ formData.availableStock || "--" }}
+        </div>
         <span slot="footer" class="dialog-footer" style="text-align: right">
           <el-button type="primary" @click="updateStock">完成</el-button>
         </span>