From 05a4a8a0fbe6b0cae1216be23ebd18639da32b7c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 15 Jul 2024 20:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/merchantDetailList.vue |  2 +-
 src/views/locality/locality.vue           | 81 +++++++++++++++++++++--
 src/views/purchaseShop/inteAmend.vue      |  4 +-
 src/views/riderTop/riderTop.vue           |  4 +-
 4 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/src/views/business/merchantDetailList.vue b/src/views/business/merchantDetailList.vue
index bc37bf5..0d28b35 100644
--- a/src/views/business/merchantDetailList.vue
+++ b/src/views/business/merchantDetailList.vue
@@ -219,7 +219,7 @@
 			</div>
 
 			<div slot="footer" class="dialog-footer">
-				<el-button @click="dialogFormVisible = false">取 消</el-button>
+				<!-- <el-button @click="dialogFormVisible = false">取 消</el-button> -->
 				<el-button type="primary" @click="couponNoticeTo()">确 定</el-button>
 
 				<el-button type="primary"
diff --git a/src/views/locality/locality.vue b/src/views/locality/locality.vue
index f09790d..975b966 100644
--- a/src/views/locality/locality.vue
+++ b/src/views/locality/locality.vue
@@ -156,7 +156,7 @@
 					</el-table-column> -->
           <el-table-column prop="duration" label="时长(分钟)">
           </el-table-column>
-          <el-table-column prop="addNum" label="加钟次数"> </el-table-column>
+          <!-- <el-table-column prop="addNum" label="加钟次数"> </el-table-column> -->
           <el-table-column prop="labels" label="标签" width="150">
           </el-table-column>
           <el-table-column prop="sales" label="销量" width="150">
@@ -202,6 +202,20 @@
               </el-switch>
             </template>
           </el-table-column>
+          <el-table-column prop="qyMinNum" label="企业预约最小次数" width="150">
+            <template slot-scope="scope">
+              <span>{{ scope.row.qyMinNum }}</span>
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                :disabled="!isAuth('locality:update')"
+                @click="updateQyMin(scope.row)"
+                style="margin: 5px"
+                >修改</el-button
+              >
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="createTime" label="创建时间">
 					</el-table-column> -->
           <el-table-column label="操作" prop="id" width="260" fixed="right">
@@ -927,7 +941,7 @@
             placeholder="请输入项目时长(分钟)"
           ></el-input>
         </div>
-        <div style="margin-bottom: 10px">
+        <!-- <div style="margin-bottom: 10px">
           <span style="width: 200px; display: inline-block; text-align: right"
             >加钟次数：</span
           >
@@ -937,7 +951,7 @@
             type="text"
             placeholder="请输入加钟次数"
           ></el-input>
-        </div>
+        </div> -->
 
         <div style="margin-bottom: 10px">
           <span style="width: 200px; display: inline-block; text-align: right"
@@ -1176,7 +1190,7 @@
 					</el-table-column> -->
           <el-table-column prop="duration" label="时长(分钟)">
           </el-table-column>
-          <el-table-column prop="addNum" label="加钟次数"> </el-table-column>
+          <!-- <el-table-column prop="addNum" label="加钟次数"> </el-table-column> -->
           <el-table-column prop="labels" label="标签" width="200">
           </el-table-column>
           <el-table-column prop="sales" label="销量"> </el-table-column>
@@ -1513,6 +1527,26 @@
           <el-button type="primary" @click="replyNoticeTo()">确 定</el-button>
         </div>
       </el-dialog>
+      <!-- 修改企业最小预约数量 -->
+      <el-dialog title="企业最小预约数量" :visible.sync="dialogFormVisibleBz" center>
+        <div style="margin-bottom: 10px">
+          <span style="width: 200px; display: inline-block; text-align: right"
+            >企业最小预约数量:</span
+          >
+          <el-input
+            style="width: 50%"
+            v-model="qyMinNum"
+            type="number"
+            min="0"
+            placeholder="请输入数量"
+          >
+          </el-input>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisibleBz = false">取 消</el-button>
+          <el-button type="primary" @click="replyNoticeTo()">确 定</el-button>
+        </div>
+      </el-dialog>
     </el-tabs>
     <el-dialog
       title="物料包列表"
@@ -1916,6 +1950,7 @@ export default {
       closeValue2: 2,
       openValue3: 1,
       closeValue3: 0,
+      qyMinNum:0,
       title: "",
       type: "",
       name: "",
@@ -4421,6 +4456,12 @@ export default {
       this.content = row.sales;
       this.dialogFormVisibleBz = true;
     },
+    // 企业预约最小数量
+    updateQyMin(row) {
+      this.ordersId = row.massageTypeId;
+      this.qyMinNum = row.qyMinNum;
+      this.dialogFormVisibleBz = true;
+    },
     // 修改
     replyNoticeTo() {
       this.$http({
@@ -4452,6 +4493,38 @@ export default {
         }
       });
     },
+    
+    // 修改
+    replyNoticeTo() {
+      this.$http({
+        url: this.$http.adornUrl("artificer/updateMassageType"),
+        method: "post",
+        // params: this.$http.adornParams({
+        data: this.$http.adornData({
+          massageTypeId: this.ordersId,
+          qyMinNum: this.qyMinNum,
+        }),
+      }).then(({ data }) => {
+        if (data.code == 0) {
+          this.$message({
+            message: "修改成功",
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.classSelect();
+            },
+          });
+          this.dialogFormVisibleBz = false;
+        } else {
+          this.$message({
+            message: data.msg,
+            type: "warning",
+            duration: 1500,
+            onClose: () => {},
+          });
+        }
+      });
+    },
     // 查询物料包列表
     getMaterialPackageDataList(row) {
       this.$http({
diff --git a/src/views/purchaseShop/inteAmend.vue b/src/views/purchaseShop/inteAmend.vue
index 1347014..2014f10 100644
--- a/src/views/purchaseShop/inteAmend.vue
+++ b/src/views/purchaseShop/inteAmend.vue
@@ -737,8 +737,8 @@
             xhr = new XMLHttpRequest();
             xhr.withCredentials = false;
             // xhr.open('POST', "https://admin.sjajk.com/sqx_fast/alioss/upload");//生产需替换
-            // xhr.open('POST', "https://sausers.blxinchuang.com/sqx_fast/alioss/upload");
-            xhr.open('POST', "http://localhost:8187/sqx_fast/alioss/upload");
+            xhr.open('POST', "https://sausers.blxinchuang.com/sqx_fast/alioss/upload");
+            // xhr.open('POST', "http://localhost:8187/sqx_fast/alioss/upload");
             xhr.onload = function() {
               var json;
 
diff --git a/src/views/riderTop/riderTop.vue b/src/views/riderTop/riderTop.vue
index 206a59d..abe6ec0 100644
--- a/src/views/riderTop/riderTop.vue
+++ b/src/views/riderTop/riderTop.vue
@@ -44,9 +44,9 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column prop="counts" label="订单数量">
+			<el-table-column prop="ddsl" label="订单数量">
 			</el-table-column>
-			<el-table-column prop="money" label="总收益">
+			<el-table-column prop="sy" label="总收益">
 			</el-table-column>
 			<el-table-column prop="zxsc" label="在线时长(分钟)">
 			</el-table-column>