0425

src/api/model/merOrder.js

@@ -0,0 +1,26 @@
+import config from "@/config";
+import http from "@/utils/request";
+
+export default {
+    list: {
+        url: `${config.API_URL}/merchant/order/list`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+    log: {
+        url: `${config.API_URL}/merchant/order/log`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+    export: {
+        url: `${config.API_URL}/merchant/order/export`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+}

src/api/model/storeOrder.js

@@ -0,0 +1,26 @@
+import config from "@/config";
+import http from "@/utils/request";
+
+export default {
+    list: {
+        url: `${config.API_URL}/store/order/list`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+    log: {
+        url: `${config.API_URL}/store/order/log`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+    export: {
+        url: `${config.API_URL}/store/order/export`,
+        name: "-",
+        get: async function (params) {
+            return await http.get(this.url, params);
+        },
+    },
+}

src/views/manage/order/components/log.vue

@@ -55,7 +55,7 @@ export default {
         },
         async getLogData(order){
             this.loading = true;
-            var resp = await this.$API.order.log.get({"order":order.order_id});
+            var resp = await this.$API.order.log.get({"order":order.order_sn});
             this.loading = false;
             this.logData = resp.data;
         }

src/views/manage/setting/menu/save.vue

@@ -37,12 +37,6 @@
 						</el-input>
 						<div class="el-form-item-msg">如父节点、链接或Iframe等没有视图的菜单不需要填写</div>
 					</el-form-item>
-					<el-form-item label="洗衣能力" prop="is_hide" v-if="type==3">
-						<el-radio-group v-model="form.is_hide">
-							<el-radio-button :label="1">门店自洗</el-radio-button>
-							<el-radio-button :label="0">洗衣地址</el-radio-button>
-						</el-radio-group>
-					</el-form-item>
 					<el-form-item label="排序" prop="sort">
 						<el-input v-model="form.sort" clearable placeholder=""></el-input>
 					</el-form-item>

src/views/merchant/order/before/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.merOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/merchant/order/done/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.merOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/merchant/order/refund/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.merOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/merchant/order/send/components/form.vue

@@ -65,7 +65,7 @@ export default {
             if(!validate){ return false }
             this.isSaveing = true;
             let submitData = JSON.parse(JSON.stringify(this.formData));
-            var resp = await this.$API.order.save.post(submitData);
+            var resp = await this.$API.merOrder.save.post(submitData);
             this.isSaveing = false;
             if (resp.code !== 1) {
                 return this.$message.error(resp.msg);

src/views/merchant/order/send/components/option.vue

@@ -10,6 +10,7 @@
                         <el-button type="primary" icon="sc-icon-download" @click="open">导出</el-button>
                     </template>
                 </sc-file-export>
+                <el-button type="danger" icon="el-icon-download" @click="table_download()">下载打印插件</el-button>
             </div>
         </div>
     </fieldset>
@@ -33,6 +34,9 @@ export default {
         }
     },
     methods: {
+        table_download(){
+            window.location.href="https://scp-tcdn.sf-express.com/scp/soft/SCPPrint_Win32NT_6.570CN.exe"
+        },
         table_export(){
             
         },

src/views/merchant/order/send/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.merOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/merchant/order/send/index.vue

@@ -2,7 +2,7 @@
     <el-container class="flex-column">
         <div class="table-search">
             <search @success="handleSuccess"></search>
-            <el-alert type="warning" show-icon title="栏目提醒" description="已预约栏目的订单，用户如取消订单，无需商家同意，产品如已发货，请尽快修改订单状态到服务中，如造成经济损失，本核销系统不负法律责任（使用自动呼叫快递功能的商家忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
+            <el-alert type="warning" show-icon title="栏目提醒" description="1、已预约栏目的订单，用户如取消订单，无需商家同意，产品如已发货，请尽快修改订单状态到服务中，如造成经济损失，本核销系统不负法律责任（使用自动呼叫快递功能的商家忽略）；2、电脑中必须先安装打印插件,点击下方【下载打印插件】按钮下载插件安装文件（使用云打印商家可忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
             <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>
         </div>
         <el-main class="nopadding">

src/views/merchant/refund/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.merOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/merchant/user/components/form.vue

@@ -125,7 +125,7 @@ export default {
             })
         },
         open(mode = 'add',type = 2){
-            if (type == 2) {
+            if (type == 3) {
                 this.titleMap = {
                     add:"新增店铺用户",
                     edit:"编辑店铺用户"

src/views/store/order/before/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.storeOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/store/order/done/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.storeOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/store/order/refund/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.storeOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/store/order/send/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.storeOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],

src/views/store/refund/components/table.vue

@@ -109,7 +109,7 @@ export default {
     data(){
         return {
             list: {
-                apiObj: this.$API.order.list
+                apiObj: this.$API.storeOrder.list
             },
             dataSelect:[],
             dataSelectFull:[],