修改bug

src/views/allocation/allocationList.vue

@@ -524,13 +524,13 @@
 					<div v-else-if="form.conditionFrom == 'v3_order_form'">
 						<template v-if="form.type == 437">
 							<!-- 三个数据，数字 -->
-							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v || 0},${getSplitValue(1,0)},${getSplitValue(2,0)}`"/>小时
+							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v || 0},${getSplitValue(1,0)},${getSplitValue(2,0)}`"/>分钟
-							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0},${getSplitValue(2,0)}`"/>小时
+							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0},${getSplitValue(2,0)}`"/>分钟
 							<el-input-number :controls="false" :precision="2" :min="0" :step="1" :value="getSplitValue(2,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${getSplitValue(1,0)},${v}`"/>元
 						</template>
 						<template v-else-if="form.type == 438">
 							<!-- //两个数据，数字 -->
-							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v},${getSplitValue(1,0)}`"/>小时
+							<el-input-number :controls="false" :precision="1" :min="0" :step="1" :value="getSplitValue(0,0)" @change="(v) => form.value = `${v},${getSplitValue(1,0)}`"/>分钟
 							<el-input-number :controls="false" :precision="2" :min="0" :step="1" :value="getSplitValue(1,0)" @change="(v) => form.value = `${getSplitValue(0,0)},${v || 0}`"/>元
 						</template>
 						<template v-else-if="form.type == 439">

src/views/applyList/technician.vue

@@ -121,6 +121,18 @@
               >
             </template>
           </el-table-column>
+          <el-table-column prop="ynJfgz" label="是否参与积分计算规则">
+            <template slot-scope="scope">
+              <span style="color: #13ce66" v-if="scope.row.ynJfgz === 1"
+                >参与</span
+              >
+              <span style="color: #ff4949" v-else>不参与</span>
+              <el-switch v-model="scope.row.ynJfgz" @change="changeJfgz(scope.row.ynJfgz,scope.row.userId)"
+								:active-value="openValue3" :disabled="!isAuth('locality:update')"
+								:inactive-value="closeValue3" active-color="#13ce66" inactive-color="#ff4949">
+							</el-switch>
+            </template>
+          </el-table-column>
           <el-table-column prop="technicianType" label="技师类型" width="150">
             <template slot-scope="scope">
               <!-- <span>{{ scope.row.technicianType }}</span> -->
@@ -1847,6 +1859,8 @@ export default {
       closeValue1: 1,
       openValue2: 1,
       closeValue2: 2,
+      openValue3: 1,
+      closeValue3: 0,
       title: "",
       type: "",
       name: "",
@@ -3976,6 +3990,37 @@ export default {
         }
       });
     },
+    //积分规则
+    changeJfgz(ynJfgz, userId) {
+      this.$http({
+        url: this.$http.adornUrl(`artificer/updateJfgz`),
+        method: "post",
+        params: this.$http.adornParams({
+          userId: userId,
+          ynJfgz: ynJfgz,
+        }),
+      }).then(({ data }) => {
+        if (data.code == 0) {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.InformationSelect();
+            },
+          });
+        } else {
+          this.$message({
+            message: data.msg,
+            type: "warning",
+            duration: 1500,
+            onClose: () => {
+              this.InformationSelect();
+            },
+          });
+        }
+      });
+    },
     // 信用分明细弹框
     xinyongBtn(row) {
       this.artificerId = row.userId;

src/views/dlssqjl/dlssqjl.vue

@@ -14,9 +14,6 @@
 		</div>
 		<el-table v-loading="tableDataLoading" :data="choicenData.list">
 			<el-table-column prop="id" label="编号" width="80">
-				<template slot-scope="scope">
-					<span>{{scope.id}}</span>
-				</template>
 			</el-table-column>
 			<el-table-column prop="name" label="姓名">
 			</el-table-column>

src/views/locality/locality.vue

@@ -1812,8 +1812,8 @@
       </el-table>
       <div style="text-align: center; margin-top: 10px">
         <el-pagination
-          @size-change="handleSizeChange"
+          @size-change="handleSizeChangeJiazhong"
-          @current-change="handleCurrentChange"
+          @current-change="handleCurrentChangeJiazhong"
           :page-size="childLimit"
           :current-page="childPage"
           layout="total, prev, pager, next,jumper"
@@ -2418,10 +2418,20 @@ export default {
       this.limit = val;
       this.classSelect();
     },
+    handleSizeChangeJiazhong(val){
+      this.childPage = val
+      console.log(`🚀 ~ handleSizeChangeJiazhong ~ this.childPage:`, this.childPage)
+      this.selectMassageTypeChildrenPage();
+    },
     handleCurrentChange(val) {
       this.page = val;
       this.classSelect();
     },
+    handleCurrentChangeJiazhong(val) {
+      this.childPage = val;
+      this.selectMassageTypeChildrenPage();
+    },
+    
     handleSizeChange1(val) {
       this.limit = val;
       this.InformationSelect();
@@ -3386,10 +3396,10 @@ export default {
                 this.clockData.list[i].contentImg.split(",");
             }
           }
-          if (this.clockData.list.length == 0) {
+          // if (this.clockData.list.length == 0) {
-            this.page = this.page - 1;
+          //   this.page = this.page - 1;
-            this.classSelect();
+          //   this.classSelect();
-          }
+          // }
         } else {
           this.$notify({
             title: "提示",

src/views/members/memberDetails.vue

@@ -27,12 +27,12 @@
       </el-table-column>
       <el-table-column prop="vipName" label="会员名称">
       </el-table-column>
-      <el-table-column prop="rate" label="优惠力度" width="150">
+      <el-table-column prop="rate" label="优惠力度（%）" width="150">
       </el-table-column>
-      <el-table-column prop="money" label="会员价格">
+      <!-- <el-table-column prop="money" label="会员价格">
       </el-table-column>
       <el-table-column prop="award" label="邀请赏金" width="150">
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="操作" fixed='right' width="200">
         <template slot-scope="scope">

src/views/purchaseShop/inteAmend.vue

@@ -737,6 +737,7 @@
             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.onload = function() {
               var json;