修改

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/views/giftManage/giftList.vue

@@ -40,7 +40,8 @@
             </el-table-column> -->
             <el-table-column align="center" min-width="100px" label="库存量" prop="actualStock">
             </el-table-column>
-
+            <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
+            </el-table-column>
             <el-table-column align="center" min-width="80px" label="兑换方式">
                 <template slot-scope="props">
                     <span v-if="props.row.deliveryType == 1">快递</span>
@@ -156,12 +157,18 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item v-if="dataForm.deliveryType==1" label="礼品所在地" prop="location">
+                <el-form-item label="礼品所在地" prop="location">
                     <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
                         <el-option :key="item.index" v-for="item in locationList" :label="item" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <!-- <el-form-item v-if="dataForm.deliveryType==0" label="礼品所在地" prop="location">
+                    <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
+                        <el-option :key="item.index" v-for="item in locationList" :label="item" :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item> -->
                 <el-form-item style="width: 800px" label="礼品图片" prop="imgUrl">
                     <el-tooltip content="建议图片宽高比260*200" placement="top-start">
                         <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"

src/views/goodsManage/goodsList.vue

@@ -154,12 +154,18 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item v-if="dataForm.deliveryType==1" label="商品所在地" prop="location">
+                <el-form-item label="商品所在地" prop="location">
                     <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
                         <el-option :key="item.index" v-for="item in locationList" :label="item" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <!-- <el-form-item v-if="dataForm.deliveryType==0" label="商品所在地" prop="location">
+                    <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
+                        <el-option :key="item.index" v-for="item in locationList" :label="item" :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item> -->
                 <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
                     <el-tooltip content="建议图片宽高比260*200" placement="top-start">
                         <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"