Merge branch 'feature/v1/plb' into 'master'

代办买药

See merge request !16

src/views/orderManagement/zqghOrder/index.vue

@@ -16,33 +16,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单状态" prop="orderSn">
-        <el-select v-model="queryParams.value" placeholder="全部" clearable="">
+      <el-form-item label="当前状态" prop="yStatus">
+        <el-select
+          v-model="queryParams.yStatus"
+          placeholder="全部"
+          clearable=""
+        >
           <el-option
             v-for="item in [
               {
                 label: '已发布',
-                value: '0',
+                value: 0,
               },
               {
                 label: '已接单',
-                value: '1',
+                value: 1,
               },
               {
                 label: '已完成',
-                value: '2',
+                value: 2,
               },
               {
                 label: '退款中',
-                value: '3',
+                value: 3,
               },
               {
                 label: '已退款',
-                value: '4',
+                value: 4,
               },
               {
                 label: '进行中',
-                value: '6',
+                value: 6,
               },
             ]"
             :key="item.value"
@@ -52,17 +56,21 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="订单类型" prop="orderSn">
-        <el-select v-model="queryParams.value" placeholder="全部" clearable="">
+      <el-form-item label="订单类型" prop="orderType">
+        <el-select
+          v-model="queryParams.orderType"
+          placeholder="全部"
+          clearable=""
+        >
           <el-option
             v-for="item in [
               {
                 label: '小程序',
-                value: '0',
+                value: 0,
               },
               {
                 label: '美团',
-                value: '1',
+                value: 1,
               },
             ]"
             :key="item.value"

vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8089`,
-        // target: `https://peizheng.shanpeikj.com/api`,
-        target: `http://192.168.0.181:8089`,
+        target: `https://peizheng.shanpeikj.com/api`,
+        // target: `http://192.168.0.181:8089`,
         // target: `http://192.168.0.137:8089`,
         // target: `http://192.168.0.199:8089`,
         // target: `http://192.168.0.125:8089`,