chengjunhui il y a 1 mois
Parent
commit
dde8f91d85
3 fichiers modifiés avec 15 ajouts et 14 suppressions
  1. 4 4
      src/views/goods/components/goodsAddTab1.vue
  2. 9 8
      src/views/shop/list.vue
  3. 2 2
      vue.config.js

+ 4 - 4
src/views/goods/components/goodsAddTab1.vue

@@ -232,7 +232,7 @@
         </el-select>
       </el-form-item>
 
-      <!-- <el-form-item label="新品" prop="newStatus">
+      <el-form-item label="新品" prop="newStatus">
         <el-radio-group v-model="form.newStatus">
           <el-radio :label="false">否</el-radio>
           <el-radio :label="true">是</el-radio>
@@ -244,14 +244,14 @@
           <el-radio :label="false">否</el-radio>
           <el-radio :label="true">是</el-radio>
         </el-radio-group>
-      </el-form-item> -->
+      </el-form-item>
 
-      <!-- <el-form-item label="显示价格" prop="showPrice">
+      <el-form-item label="显示价格" prop="showPrice">
         <el-radio-group v-model="form.showPrice">
           <el-radio :label="false">否</el-radio>
           <el-radio :label="true">是</el-radio>
         </el-radio-group>
-      </el-form-item> -->
+      </el-form-item>
 
       <el-form-item label="是否单规格" prop="singleSku">
         <el-radio-group v-model="form.singleSku">

+ 9 - 8
src/views/shop/list.vue

@@ -97,8 +97,8 @@
             </span> -->
             <el-dropdown-menu slot="dropdown">
               <!-- <el-dropdown-item @click.native="handleDelete(row)">删除</el-dropdown-item> -->
-              <el-dropdown-item
-                @click.native="$downloadImage(row.qrCode, row.businessName + '店铺码')">下载店铺码</el-dropdown-item>
+              <!-- <el-dropdown-item
+                @click.native="$downloadImage(row.qrCode, row.businessName + '店铺码')">下载店铺码</el-dropdown-item> -->
               <el-dropdown-item @click.native="$refs.businessDataRef.openHandle(row)">经营明细</el-dropdown-item>
 
               <!-- 数据迁移:仅连锁店可操作。普通独立店铺无此功能。 -->
@@ -109,14 +109,14 @@
                   row.businessUser.userId ? '修改商家管理员' : '新增商家管理员' }}</el-dropdown-item>
                 <el-dropdown-item v-if="row.businessUser && row.businessUser.userId"
                   @click.native="handleResetPwd(row.businessUser)">重置商家管理员密码</el-dropdown-item>
-                <el-dropdown-item
-                  @click.native="$refs.queueImportRef.openHandle(row, row.businessName + '导入排队订单')">排队导入</el-dropdown-item>
+                <!-- <el-dropdown-item
+                  @click.native="$refs.queueImportRef.openHandle(row, row.businessName + '导入排队订单')">排队导入</el-dropdown-item> -->
                 <el-dropdown-item @click.native="closeShop(row)">店铺关闭</el-dropdown-item>
               </template>
               <!-- 只有关闭的连锁店才允许数据迁移 -->
-              <el-dropdown-item
+              <!-- <el-dropdown-item
                 v-else-if="[ShopTypeEnum.BRANCH_OFFICE, ShopTypeEnum.HEAD_OFFICE].includes(row.businessType)"
-                @click.native="$refs.queueOrderRef.openHandle(row)">数据迁移</el-dropdown-item>
+                @click.native="$refs.queueOrderRef.openHandle(row)">数据迁移</el-dropdown-item> -->
 
             </el-dropdown-menu>
           </el-dropdown>
@@ -132,10 +132,11 @@
     <PayConfig ref="payConfigRef" />
     <!-- 经营数据 -->
     <BusinessData ref="businessDataRef" />
+    
     <!-- 排队订单 -->
-    <QueueOrder ref="queueOrderRef" />
+    <!-- <QueueOrder ref="queueOrderRef" /> -->
     <!-- 排队导入 -->
-    <QueueImport ref="queueImportRef" :ImportApi="importSubsidyQueueApi" @refresh="getList" />
+    <!-- <QueueImport ref="queueImportRef" :ImportApi="importSubsidyQueueApi" @refresh="getList" /> -->
   </div>
 </template>
 

+ 2 - 2
vue.config.js

@@ -35,9 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.152:8300`,
+        // target: `http://192.168.0.152:8300`,
         // target: `http://192.168.0.17:8291`,
-        // target: `http://192.168.0.70:8300`,  // 郭
+        target: `http://192.168.0.70:8300`,  // 郭
         // target: 'https://shop.xiaocaituan.com/hd-api',
         changeOrigin: true,
         pathRewrite: {