'2210'

src/api/model/dash.js

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

src/api/model/store.js

@@ -37,4 +37,11 @@ export default {
             return await http.post(this.url, params);
         },
     },
+    auth: {
+        url: `${config.API_URL}/store/auth`,
+        name: "-",
+        post: async function (params) {
+            return await http.post(this.url, params);
+        },
+    },
 }

src/views/manage/dashboard/index.vue

@@ -106,9 +106,9 @@ export default {
         }
     },
     created(){
-        var baseData = this.$TOOL.data.get("AGENT_SERVICE");
+        var baseData = this.$TOOL.data.get("SERVICE");
         this.baseData = baseData;
-        // this.getData()
+        this.getData()
     },
     methods: {
         async getData(){

src/views/manage/order/life/components/table.vue

@@ -17,6 +17,12 @@
                 <span>{{ scope.row.store?scope.row.store.store_name:'-' }}</span>
             </template>
         </el-table-column>
+        <el-table-column label="用户ID" prop="open_id" width="320">
+            <template #default="scope">
+                <span v-if="scope.row.open_id">{{ scope.row.open_id }}</span>
+                <span class="status-danger" v-else>未设置</span>
+            </template>
+        </el-table-column>
         <el-table-column label="商品ID" prop="out_id" width="150">
             <template #default="scope">
                 <span v-if="scope.row.out_id">{{ scope.row.out_id }}</span>
@@ -29,12 +35,6 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="手机号码" prop="mobile" width="120">
-            <template #default="scope">
-                <span v-if="scope.row.mobile">{{ scope.row.mobile }}</span>
-                <span class="status-danger" v-else>未同步</span>
-            </template>
-        </el-table-column>
         <el-table-column label="数量" prop="count" width="100">
             <template #default="scope">
                 <span>{{ scope.row.count }}件</span>
@@ -78,13 +78,6 @@
             </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="create_at" width="180"></el-table-column>
-        <el-table-column label="操作" width="80" align="right" fixed="right">
-            <template #default="scope">
-                <el-button-group>
-                    <el-button text size="small" @click="table_express(scope.row)" v-if="scope.row.status==1">手动录单</el-button>
-                </el-button-group>
-            </template>
-        </el-table-column>
     </scTable>
     <formMain ref="formMain" @success="handleSuccess"></formMain>
     <addMain ref="addMain" @success="handleSuccess"></addMain>

src/views/manage/setting/basic/index.vue

@@ -40,14 +40,72 @@
                         </el-tab-pane>
                         <el-tab-pane label="抖音小程序" name="dy" v-loading="isLoading">
                             <el-form :model="sys" :rules="rules2" ref="form" label-position="top" @keyup.enter="saveForm" v-if="activeName=='dy'">
-                                <el-form-item label="应用ID（AppId）" prop="appid">
-                                    <el-input v-model="sys.appid" clearable placeholder="请输入AppId"></el-input>
-                                    <div class="el-form-item-msg">通过抖音小程序后台获取</div>
-                                </el-form-item>
-                                <el-form-item label="应用密钥（AppSecret）" prop="secret">
-                                    <el-input v-model="sys.secret" clearable placeholder="请输入AppSecret"></el-input>
-                                    <div class="el-form-item-msg">通过抖音小程序后台获取</div>
-                                </el-form-item>
+                                <el-row :gutter="15">
+                                    <el-col :span="this.$store.state.global.ismobile?24:24">
+                                        <el-form-item label="应用ID（AppId）" prop="appid">
+                                            <el-input v-model="sys.appid" clearable placeholder="请输入AppId"></el-input>
+                                            <div class="el-form-item-msg">通过抖音小程序后台获取</div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="this.$store.state.global.ismobile?24:24">
+                                        <el-form-item label="应用密钥（AppSecret）" prop="secret">
+                                            <el-input v-model="sys.secret" clearable placeholder="请输入AppSecret"></el-input>
+                                            <div class="el-form-item-msg">通过抖音小程序后台获取</div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="this.$store.state.global.ismobile?24:12">
+                                        <el-form-item label="自动呼叫快递时间-开始" prop="express_start">
+                                            <el-time-select
+                                                v-model="sys.express_start"
+                                                :style="{ width: '100%' }"
+                                                start="00:30"
+                                                step="00:15"
+                                                end="23:30"
+                                                placeholder="自动呼叫快递时间"
+                                            />
+                                            <div class="el-form-item-msg">未到该时间不允许自动或手动呼叫快递</div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="this.$store.state.global.ismobile?24:12">
+                                        <el-form-item label="自动呼叫快递时间-结束" prop="express_end">
+                                            <el-time-select
+                                                v-model="sys.express_end"
+                                                :style="{ width: '100%' }"
+                                                start="00:30"
+                                                step="00:15"
+                                                end="23:30"
+                                                placeholder="自动呼叫快递时间"
+                                            />
+                                            <div class="el-form-item-msg">超过该时间不允许自动或手动呼叫快递</div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="this.$store.state.global.ismobile?24:12">
+                                        <el-form-item label="核销时间-开始" prop="end_start">
+                                            <el-time-select
+                                                v-model="sys.end_start"
+                                                :style="{ width: '100%' }"
+                                                start="00:30"
+                                                step="00:15"
+                                                end="23:30"
+                                                placeholder="核销时间"
+                                            />
+                                            <div class="el-form-item-msg">未到该时间不允许自动或手动核销订单</div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="this.$store.state.global.ismobile?24:12">
+                                        <el-form-item label="核销时间-结束" prop="end_end">
+                                            <el-time-select
+                                                v-model="sys.end_end"
+                                                :style="{ width: '100%' }"
+                                                start="00:30"
+                                                step="00:15"
+                                                end="23:30"
+                                                placeholder="核销时间"
+                                            />
+                                            <div class="el-form-item-msg">超过该时间不允许自动或手动核销订单</div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
                             </el-form>
                         </el-tab-pane>
                         <el-tab-pane label="短信设置（非代理）" name="sms" v-loading="isLoading">

src/views/manage/shop/index/components/table.vue

@@ -50,6 +50,7 @@
         <el-table-column label="操作" width="220" align="center" fixed="right">
             <template #default="scope">
                 <el-button-group>
+                    <el-button text type="warning" size="small" @click="table_auth(scope.row)">设置Path</el-button>
                     <el-button text type="primary" size="small" @click="table_view(scope.row)">编辑</el-button>
                     <el-button text type="danger" size="small" @click="table_del(scope.row)">删除</el-button>
                 </el-button-group>
@@ -77,6 +78,18 @@ export default {
     },
     
     methods: {
+        table_auth(data){
+            this.$confirm(`【必须】设置小程序全量用户订单按钮以及跳转路径`, '提示', {
+                type: 'warning'
+            }).then(async ()=>{
+                var resp = await this.$API.store.auth.post({"id":data.id});
+                if (resp.code == 0) {
+                    return this.$message.error(resp.msg);
+                }
+                this.$message.success(resp.msg);
+                this.$emit("success");
+            }).catch(()=>{})
+        },
         table_view(data){
             this.$nextTick(() => {
                 this.$refs.formMain.open("edit").setData(data)
@@ -86,9 +99,9 @@ export default {
             this.$confirm(`删除店铺后，所有有关该店铺的门店、订单等信息都将删除，不可恢复，确定要执行删除吗`, '提示', {
                 type: 'warning'
             }).then(async ()=>{
-                var resp = await this.$API.agent.del.post({"id":data.id});
+                var resp = await this.$API.store.del.post({"id":data.id});
                 if (resp.code == 0) {
-                    return this.$message.warning(resp.msg);
+                    return this.$message.error(resp.msg);
                 }
                 this.$message.success(resp.msg);
                 this.$emit("success");

src/views/manage/shop/index/index.vue

@@ -1,5 +1,6 @@
 <template>
     <el-container class="flex-column">
+        <el-alert type="warning" title="添加完店铺后，必须点击【设置Path】，不然抖音下单后会没有进入小程序的入口" :closable="false" style="margin-bottom: 10px;"></el-alert>
         <div class="table-search">
             <search @success="handleSuccess"></search>
             <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>