cmy 3 viikkoa sitten
vanhempi
commit
a001fdf3d3

+ 2 - 2
.env.dev

@@ -4,7 +4,7 @@ VUE_APP_ENV='dev'
 # 页面 title
 VUE_APP_TITLE=百达福生
 # socket 系统长连接地址
-VUE_APP_WS_ADMIN_URL='ws://www.baidafusheng.com/ws'
+VUE_APP_WS_ADMIN_URL='ws://dbyt.qiniu1314.com/ws'
 # 接口请求地址
-VUE_APP_API_URL='https://www.baidafusheng.com/adminapi'
+VUE_APP_API_URL='https://dbyt.qiniu1314.com/adminapi'
 

+ 1 - 1
src/pages/marketing/shortVideo/create.vue

@@ -236,7 +236,7 @@
                 },
                 headeNum: [
                     { type: "1", name: "基础设置" },
-                    { type: "2", name: "关联商品" }
+                    // { type: "2", name: "关联商品" }
                 ],
                 formValidate:{
                     desc:'',

+ 9 - 9
src/pages/marketing/shortVideo/index.vue

@@ -185,10 +185,10 @@
                 options:timeOptions,
                 headeNum: [
                     { type: "", name: "全部" },
-                    { type: "1", name: "已通过审核" },
-                    { type: "0", name: "待审核" },
-                    { type: "-1", name: "审核未通过" },
-                    { type: "-2", name: "强制下架" }
+                    // { type: "1", name: "已通过审核" },
+                    // { type: "0", name: "待审核" },
+                    // { type: "-1", name: "审核未通过" },
+                    // { type: "-2", name: "强制下架" }
                 ],
                 loading: false,
                 columns1: [
@@ -252,11 +252,11 @@
                         slot: "is_show",
                         minWidth: 100,
                     },
-                    {
-                        title: "是否推荐",
-                        slot: "is_recommend",
-                        minWidth: 100,
-                    },
+                    // {
+                    //     title: "是否推荐",
+                    //     slot: "is_recommend",
+                    //     minWidth: 100,
+                    // },
                     {
                         title: "排序",
                         key: "sort",

+ 12 - 12
src/pages/order/orderList/handle/orderDetails.vue

@@ -22,7 +22,7 @@
               <div>订单编号:{{ orderDatalist.orderInfo.order_id }}</div>
             </div>
             <div v-if="rowActive.delete_time == null">
-              <Button
+              <!-- <Button
                 :class="openErp ? 'on' : ''"
                 :disabled="openErp"
                 v-if="
@@ -32,14 +32,14 @@
                 "
                 @click="changeMenu('1')"
                 >立即支付
-              </Button>
-              <Button
+              </Button> -->
+             <!-- <Button
                 :class="openErp ? 'on' : ''"
                 :disabled="openErp"
                 v-if="orderData._status_new == 2 && !rowActive.split.length && (!formType || !orderData.refund.length)"
                 @click="distribution"
                 >分配
-              </Button>
+              </Button> -->
               <Button
                 :class="openErp ? 'on' : ''"
                 :disabled="openErp"
@@ -47,7 +47,7 @@
                 @click="edit"
                 >编辑
               </Button>
-              <Button
+              <!-- <Button
                 :class="openErp ? 'on' : ''"
                 :disabled="openErp"
                 v-if="
@@ -59,7 +59,7 @@
                 "
                 @click="sendOrder"
                 >发送货
-              </Button>
+              </Button> -->
               <Button
                 :class="openErp ? 'on' : ''"
                 :disabled="openErp"
@@ -907,12 +907,12 @@
                 </template>
               </template>
               <template slot-scope="{ row, index }" slot="action">
-                <a
+                <!-- <a
                   :disabled="openErp"
                   @click="distribution(row, 1)"
                   v-if="row._status === 2 && !row.supplier_name"
                   >分配</a
-                >
+                > -->
                 <Divider
                   type="vertical"
                   v-if="row._status === 2 && !row.supplier_name && row.store_id==0"
@@ -923,7 +923,7 @@
                   v-if="row._status === 1"
                   >编辑</a
                 >
-                <a
+               <!-- <a
                   :disabled="openErp"
                   @click="sendOrder(row, 1)"
                   v-if="
@@ -935,7 +935,7 @@
                     !row.supplier_name && row.store_id==0
                   "
                   >发送货</a
-                >
+                > -->
                 <a
                   :disabled="openErp"
                   @click="delivery(row, 1)"
@@ -1005,7 +1005,7 @@
                       <Icon type="ios-arrow-down"></Icon>
                     </a>
                     <DropdownMenu slot="list">
-                      <DropdownItem
+                     <!-- <DropdownItem
                         :disabled="openErp"
                         name="1"
                         ref="ones"
@@ -1015,7 +1015,7 @@
                           row.pay_type === 'offline'
                         "
                         >立即支付</DropdownItem
-                      >
+                      > -->
                       <!-- <DropdownItem name="2">订单详情</DropdownItem> -->
                       <DropdownItem :disabled="openErp" name="3"
                         >订单记录</DropdownItem

+ 2 - 2
src/pages/supplier/components/supplierDetails.vue

@@ -870,7 +870,7 @@
                       <Icon type="ios-arrow-down"></Icon>
                     </a>
                     <DropdownMenu slot="list">
-                      <DropdownItem
+                      <!-- <DropdownItem
                         :disabled="openErp"
                         name="1"
                         ref="ones"
@@ -880,7 +880,7 @@
                           row.pay_type === 'offline'
                         "
                         >立即支付</DropdownItem
-                      >
+                      > -->
                       <DropdownItem name="10" v-show="row._status >= 2"
                         >小票打印</DropdownItem
                       >