调整

admin/src/api/admin.js

@@ -17,7 +17,7 @@ export function addProducts(data) {
 // 获取商品列表
 export function getProductsListsApi(data) {
   return request({
-    url: `/admin/products/list?page=${data.page}&limit=${data.limit}`,
+    url: `/admin/products/list?page=${data.page}&limit=${data.limit}&product_name=${data.product_name??''}&third_product_id=${data.third_product_id ?? ''}`,
     method: "get",
   });
 }

admin/src/router/index.js

@@ -144,7 +144,7 @@ export const asyncRoutes = [
         component: () => import("@/views/proManagement/scheduling"),
         name: "ProScheduling",
         meta: {
-          title: "排班管理",
+          title: "班期管理",
           roles: ["admin"],
           hidden: true,
         },

admin/src/views/admin/index.vue

@@ -183,7 +183,6 @@
           >
             <img v-if="item.wechat_pic" :src="item.wechat_pic" style="width: 120px; height: 120px;margin-top: 14px;"/>
             <img v-if="!item.wechat_pic" src="~@/assets/home/wechat.png" style="width: 120px; height: 120px;margin-top: 14px;"/>
-            <i slot="default" class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="密码">

admin/src/views/order/appointment.vue

@@ -58,9 +58,9 @@
       </el-table-column>
       <el-table-column align="center" label="券码图片" width="120">
         <template slot-scope="scope">
-          <el-image
+          <el-image v-for="pic in scope.row.code_pic"
             style="width: 100px; height: 100px"
-            :src="scope.row.code_pic_show"
+            :src="pic"
             :preview-src-list="scope.row.code_pic"
           >
           </el-image>

admin/src/views/proManagement/index.vue

@@ -2,8 +2,14 @@
   <div class="app-container">
     <div class="filter-container">
       <el-input
-        v-model="listQuery.username"
+        v-model="listQuery.product_name"
-        placeholder="用户名"
+        placeholder="商品名称"
+        style="width: 200px; margin-right: 10px"
+        class="filter-item"
+      />
+      <el-input
+        v-model="listQuery.third_product_id"
+        placeholder="平台商品ID"
         style="width: 200px; margin-right: 10px"
         class="filter-item"
       />
@@ -56,13 +62,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        align="center"
-        label="平台商品ID"
-        width="200"
-        prop="third_product_id"
-      ></el-table-column>
-
       <el-table-column
         align="center"
         label="商品名称"
@@ -76,6 +75,13 @@
         prop="os_name"
       ></el-table-column>
 
+      <el-table-column
+        align="center"
+        label="平台商品ID"
+        width="200"
+        prop="third_product_id"
+      ></el-table-column>
+
       <el-table-column align="type" label="境内/境外" width="100" prop="type">
         <template slot-scope="scope">
           <span>{{ scope.row.type === 1 ? "境内" : "境外" }}</span>
@@ -224,7 +230,7 @@ export default {
     return {
       listQuery: {
         page: 1,
-        limit: 20,
+        limit: 10,
       },
       total: 0,
       listLoading: true,
@@ -319,8 +325,8 @@ export default {
       this.dialogVisible = true;
     },
     async getList() {
+      console.log("this.listQuery", this.listQuery);
       const res = await getProductsListsApi(this.listQuery);
-      console.log(res, "我我我");
       if (res.error === 0) {
         this.listLoading = false;
         this.total = res.data.total;

admin/src/views/proManagement/scheduling.vue

@@ -39,7 +39,7 @@
       :visible.sync="dialogVisible"
       @open="onOpen"
       @close="onClose"
-      title="预约行程"
+      title="编辑"
     >
       <el-form
         ref="elForm"

service/app/admin/controller/OrderController.php

@@ -47,7 +47,6 @@ class OrderController extends base
         $status = $request->get('status', null);
 
         $query = Orders::attimes($timetype, $times)->with(['admin','anchor','backs', 'mobileInfo'])->where($where)
-            ->order('create_at','desc')
             ->order('update_time','desc')
             ->order('id','desc');
 
@@ -419,7 +418,7 @@ class OrderController extends base
                 'apply_id' => $request->admin->id,
                 'status' => 1
             ]);
-            Orders::where('sn', $value)->update(['admin_id'=> $toAdminId]);
+            Orders::where('sn', $value)->update(['admin_id'=> $toAdminId, 'update_time' => time()]);
             // 发送短信
             \app\server\Orders::sendOrderSms($toAdminId, $item);
         }

service/app/admin/controller/ProductsController.php

@@ -20,15 +20,13 @@ class ProductsController extends base {
      * @throws \think\db\exception\DbException
      */
     public function list(Request $request) {
+        $params = $request->all();
         $query = Products::where('status', 1)->order('id', 'desc');
-        if($username = $request->get('username')) {
+        if(isset($params['product_name']) && !empty($params['product_name'])) {
-            $query->where('username', $username);
+            $query->whereLike('product_name', "%{$params['product_name']}%");
         }
-        if($status = $request->get('status')) {
+        if(isset($params['third_product_id']) && !empty($params['third_product_id'])) {
-            $query->where('status', $status);
+            $query->where('third_product_id', $params['third_product_id']);
-        }
-        if($is_order = $request->get('is_order')) {
-            $query->where('is_order', $is_order);
         }
 
         $list = $query->append(['os_name'])->paginate($request->get('limit',1000));

service/app/api/controller/OrderController.php

@@ -23,7 +23,7 @@ class OrderController extends base
     public function index(Request $request) {
         $mobile = $request->get('mobile');
         if (empty($mobile) || !Validator::mobile()->validate($mobile)) {
-            return $this->error('手机号格式错误');
+            return $this->error('请输入正确的手机号');
         }
         $where = [];
         $os = [1, 7];

service/app/server/Orders.php

@@ -343,7 +343,11 @@ class Orders {
         if ((!config('app.debug', true) || config('app.debug', true) === 'false') && (time() * 1000 - $order->create_at) / 1000 < 2 * 24 * 3600) {
             $has = Blacks::where('mobile', $order->mobile)->find();
             if (empty($has) && !empty($order->mobile)) {
+                if (env('SMS_JUMP_URL')) {
+                    SMS::juhe_sms_send($order->mobile, 265867, ['title' => $order->product_name, 'mobile' => $user->mobile, 'url' => env('SMS_JUMP_URL')]);
+                } else {
                     SMS::juhe_sms_send($order->mobile, 261607, ['title' => $order->product_name, 'mobile' => $user->mobile]);
+                }
             } else {
                 sleep(10);
             }

service/public/static/css/chunk-095f98c6.1bdc974b.css

@@ -1 +1 @@
-.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}.link-type[data-v-1383312c]{color:#07b5f9;cursor:pointer}
+.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}.link-type[data-v-b430e112]{color:#07b5f9;cursor:pointer}

service/public/static/css/chunk-30b744ac.d5863463.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-3c40dbf0]{position:relative;padding-bottom:60px}.el-table[data-v-3c40dbf0],.filter-container[data-v-3c40dbf0]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-f117a39e]{position:relative;padding-bottom:60px}.el-table[data-v-f117a39e],.filter-container[data-v-f117a39e]{padding-bottom:52px}[data-v-f117a39e] .el-image-viewer__close{background-color:#fff}

service/public/static/css/chunk-31cf3465.d21b89fe.css

@@ -1 +0,0 @@
-.pro_scheduling[data-v-21d88d0c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.pro_scheduling .el-calendar[data-v-21d88d0c]{margin:20px 0}.pro_scheduling[data-v-21d88d0c] .el-calendar-table .el-calendar-day{height:130px}.test[data-v-21d88d0c]{color:#c6ccd2;font-size:14px;margin-top:10px}.yy[data-v-21d88d0c]{color:#8a8c90;font-size:14px;margin-top:10px}

service/public/static/css/chunk-45f7d646.ce06fa29.css

@@ -0,0 +1 @@
+.pick[data-v-81a84594]{position:relative;top:20px;left:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:50px}.pick span[data-v-81a84594]{margin-right:20px}.pro_scheduling[data-v-81a84594]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative}.pro_scheduling .el-calendar[data-v-81a84594]{margin:20px 0}.pro_scheduling[data-v-81a84594] .el-calendar-table .el-calendar-day{height:130px}.test[data-v-81a84594]{color:#c6ccd2;font-size:14px;margin-top:10px}.yy[data-v-81a84594]{color:#8a8c90;font-size:14px;margin-top:10px}[data-v-81a84594] .el-calendar-table:not(.is-range) td.next,[data-v-81a84594] .el-calendar-table:not(.is-range) td.prev{cursor:not-allowed;pointer-events:none}.next>.el-calendar-day>.dateContent[data-v-81a84594],.prev>.el-calendar-day>.dateContent[data-v-81a84594]{display:none}[data-v-81a84594] .el-calendar-table:not(.is-range) td.next{visibility:hidden}[data-v-81a84594] .el-calendar__button-group,[data-v-81a84594] .el-calendar__title{display:none}[data-v-81a84594] .el-calendar-table thead th{font-weight:700;color:#202020}

service/public/static/css/chunk-737f3001.bbcdbaa5.css

@@ -1 +0,0 @@
-.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}[data-v-c49a2ed6].el-select{width:100%}.addRoutes[data-v-c49a2ed6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end}

service/public/static/css/chunk-8eb7ee56.d70c831d.css

@@ -1 +0,0 @@
-.contract[data-v-c53fc720]{padding-top:20px}.contract .lay[data-v-c53fc720]{width:100%}.contract .lay .flex[data-v-c53fc720]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:20px;margin-bottom:20px}.contract .lay .word[data-v-c53fc720]{margin:0 50px}

service/public/static/css/chunk-c5ad1962.04217b45.css

@@ -0,0 +1 @@
+.contract[data-v-0749413b]{padding-top:20px}.contract .lay[data-v-0749413b]{width:100%}.contract .lay .flex[data-v-0749413b]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:20px;margin-bottom:20px}.contract .lay .word[data-v-0749413b]{margin:0 50px}

service/public/static/css/chunk-fa8e784e.651089a2.css

@@ -0,0 +1 @@
+.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}[data-v-1c619b78].el-select{width:100%}.addRoutes[data-v-1c619b78]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end}