店铺装修修改

src/apis/user/index.js

@@ -1,10 +1,12 @@
 import http from "@/apis/axios";
-import urlConfig from "@/apis/url-config";
-import { getToken } from "@/utils/auth";
+// import urlConfig from "@/apis/url-config";
+// import { getToken } from "@/utils/auth";
 
 export default {
   // 登录
   login: (data, params) => http("admin/login/login", data, "post", params),
+  //手机号验证码登录
+  mobileLogin: (data, params) => http("api/wechat/loginByMobile", data, "post", params),
   //
   requestMenus: (data, params) =>
     http("admin/menu/query", data, "post", params),

src/store/modules/user.js

@@ -181,6 +181,21 @@ const actions = {
       throw err
     }
   },
+    // user login
+    async mobileLogin({ commit }, userInfo) {
+      try{
+        const response = await asyncRequest.mobileLogin(userInfo)
+        const { code, data } = response
+        if(Number(code) === 1){
+          const { token } = data;
+          commit('SET_TOKEN',token)
+          setToken(token)
+        }
+        return response
+      }catch (err){
+        throw err
+      }
+    },
 
   dingUserInfor({ commit }, code) {
     return new Promise(async (resolve, reject) => {

src/views/login/index1.vue

@@ -16,7 +16,7 @@
           </h3>
         </div>
 
-        <el-form-item prop="mobile">
+        <el-form-item prop="mobile" >
           <el-input
             ref="mobile"
             v-model="loginForm.mobile"
@@ -34,7 +34,7 @@
         </el-form-item>
 
    
-          <el-form-item prop="code">
+          <el-form-item prop="code" >
             
             <el-input
               ref="code"
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import { isnumber, isAlphanumeric, validAlphabets, isMobile } from "@/utils/validate";
+import { isnumber, isMobile } from "@/utils/validate";
 import asyncRequest from "@/apis/service/user";
 import Identify from "@/components/identify";
 import urlConfig from "@/apis/url-config";
@@ -119,7 +119,6 @@ export default {
       loginForm: {
         mobile: "19944520491",
         code: "123456",
-        pageCode: "",
       },
       loginRules: {
         mobile: [{ required: true, trigger: "blur", validator: validatemobile }],
@@ -148,7 +147,6 @@ export default {
     },
   },
   mounted() {
-    this.refreshCode();
     // this.getversion();
     if (this.loginForm.mobile === "") {
       this.$refs.mobile.focus();
@@ -158,22 +156,15 @@ export default {
   },
  
   methods: {
-    setVisible(val) {
-      this.show = val;
-    },
-    handleClick() {
-      this.show = true;
-    },
-    handleSuccess() {
-      this.show = false;
-      this.handleLogin();
-    },
+ 
+  
+  
   
    
     async handleLogin() {
       try {
         await this.$refs.loginForm.validate();
-        const response = await this.$store.dispatch("user/login", this.loginForm);
+        const response = await this.$store.dispatch("user/mobileLogin", this.loginForm);
         const { code } = response;
         if (Number(code) === 1) this.getMenu();
         this.loading = false;
@@ -258,7 +249,7 @@ $cursor: #fff;
     }
 
     .login-form {
-      width: 400px;
+      width: 330px;
       top: -40px;
       right: 100px;
       z-index: 3;

src/views/operate/shopTrim/baseData/columns.js

@@ -1,27 +1,27 @@
 const formItem = {
   // id: "",
   renovation_date: "2023",
-  park_num: "0",
+  park_num: 0,
   store_spec_ids: [],
-  caterer_spec_ids: [],
-  hotel_spec_ids: [],
-  room_spec_ids: [],
-  caterer_spec_ids2:[],
+  caterer_spec_tags: [],
+  hotel_spec_tags: [],
+  room_spec_tags: [],
+  conference_spec_tags:[],
   store_desc: "qq",
 };
 const checkAll= {
   store_spec_ids: false,
-  caterer_spec_ids: false,
-  hotel_spec_ids: false,
-  room_spec_ids: false,
-  caterer_spec_ids2: false,
+  caterer_spec_tags: false,
+  hotel_spec_tags: false,
+  room_spec_tags: false,
+  conference_spec_tags: false,
 };
 const isIndeterminate= {
   store_spec_ids: true,
-  caterer_spec_ids: true,
-  hotel_spec_ids: true,
-  room_spec_ids: true,
-  caterer_spec_ids2: true,
+  caterer_spec_tags: true,
+  hotel_spec_tags: true,
+  room_spec_tags: true,
+  conference_spec_tags: true,
 };
 
 const rules = {
@@ -37,33 +37,33 @@ const rules = {
       trigger: "change",
     },
   ],
-  caterer_spec_ids: [
+  caterer_spec_tags: [
     {
-      required: true,
+      required: false,
       type: "array",
       message: "至少选择一个餐饮设施",
       trigger: "change",
     },
   ],
-  hotel_spec_ids: [
+  hotel_spec_tags: [
     {
-      required: true,
+      required: false,
       type: "array",
       message: "至少选择一个酒店设施",
       trigger: "change",
     },
   ],
-  room_spec_ids: [
+  room_spec_tags: [
     {
-      required: true,
+      required: false,
       type: "array",
       message: "至少选择一个客房设施",
       trigger: "change",
     },
   ],
-  caterer_spec_ids2: [
+  conference_spec_tags: [
     {
-      required: true,
+      required: false,
       type: "array",
       message: "至少选择一个会议设施",
       trigger: "change",
@@ -74,17 +74,17 @@ const rules = {
   ],
 };
 const config = {
-  room_spec_ids: [
+  room_spec_tags: [
     "中央空调",
     "24小时热水",
     "暖气",
     "温泉",
-    // "免费洗漱用品",
+    "免费洗漱用品",
     "电热水壶",
     "吹风机",
     "拖鞋",
   ],
-  hotel_spec_ids: [
+  hotel_spec_tags: [
     "免费停车场",
     "公交站",
     "商务中心",
@@ -98,8 +98,8 @@ const config = {
     "康体娱乐",
     "有山有水",
   ],
-  caterer_spec_ids: ["大堂吧", "中餐厅"],
-  caterer_spec_ids2: [
+  caterer_spec_tags: ["大堂吧", "中餐厅"],
+  conference_spec_tags: [
     "暖气",
     "地毯",
     "音响",

src/views/operate/shopTrim/baseData/index.vue

@@ -83,30 +83,30 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="酒店设施" prop="hotel_spec_ids" size="mini">
+          <el-form-item label="酒店设施" prop="hotel_spec_tags" size="mini">
             <div class="clear-main">
               <div class="clear-left">
                 <el-checkbox
-                  :indeterminate="isIndeterminate.hotel_spec_ids"
-                  v-model="checkAll.hotel_spec_ids"
+                  :indeterminate="isIndeterminate.hotel_spec_tags"
+                  v-model="checkAll.hotel_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
-                    handleCheckAllChange($event, 'hotel_spec_ids', hotel_spec_ids_options)
+                    handleCheckAllChange($event, 'hotel_spec_tags', hotel_spec_tags_options)
                   "
                   >全选</el-checkbox
                 >
               </div>
               <div class="clear-right">
                 <el-checkbox-group
-                  v-model="ruleForm.hotel_spec_ids"
+                  v-model="ruleForm.hotel_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
                     handleCheckedCitiesChange(
                       $event,
-                      'hotel_spec_ids',
-                      hotel_spec_ids_options
+                      'hotel_spec_tags',
+                      hotel_spec_tags_options
                     )
                   "
                 >
@@ -114,7 +114,7 @@
                     <el-col :span="3"></el-col>
                     <el-col
                       :span="3"
-                      v-for="(item, index) in hotel_spec_ids_options"
+                      v-for="(item, index) in hotel_spec_tags_options"
                       :key="item + index"
                     >
                       <el-checkbox style="margin: 0" size="mini" :label="item + ''">{{
@@ -125,7 +125,7 @@
                       <el-button
                         size="mini"
                         type="text"
-                        @click="openModal('hotel_spec_ids', '酒店设施', hotel_spec_ids_options)"
+                        @click="openModal('hotel_spec_tags', '酒店设施', hotel_spec_tags_options)"
                         >添加</el-button
                       >
                     </el-col>
@@ -134,19 +134,19 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="会议设施" prop="caterer_spec_ids2" size="mini">
+          <el-form-item label="会议设施" prop="conference_spec_tags" size="mini">
             <div class="clear-main">
               <div class="clear-left">
                 <el-checkbox
-                  :indeterminate="isIndeterminate.caterer_spec_ids2"
-                  v-model="checkAll.caterer_spec_ids2"
+                  :indeterminate="isIndeterminate.conference_spec_tags"
+                  v-model="checkAll.conference_spec_tags"
                   style="margin: 0"
                   size="mini"
                   @change="
                     handleCheckAllChange(
                       $event,
-                      'caterer_spec_ids2',
-                      caterer_spec_ids2_options
+                      'conference_spec_tags',
+                      conference_spec_tags_options
                     )
                   "
                   >全选</el-checkbox
@@ -154,21 +154,21 @@
               </div>
               <div class="clear-right">
                 <el-checkbox-group
-                  v-model="ruleForm.caterer_spec_ids2"
+                  v-model="ruleForm.conference_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
                     handleCheckedCitiesChange(
                       $event,
-                      'caterer_spec_ids2',
-                      caterer_spec_ids2_options
+                      'conference_spec_tags',
+                      conference_spec_tags_options
                     )
                   "
                 >
                   <el-row>
                     <el-col
                       :span="3"
-                      v-for="(item, index) in caterer_spec_ids2_options"
+                      v-for="(item, index) in conference_spec_tags_options"
                       :key="item + index"
                     >
                       <el-checkbox style="margin: 0" size="mini" :label="item + ''">{{
@@ -179,7 +179,7 @@
                       <el-button
                         size="mini"
                         type="text"
-                        @click="openModal('caterer_spec_ids2', '会议设施', caterer_spec_ids2_options)"
+                        @click="openModal('conference_spec_tags', '会议设施', conference_spec_tags_options)"
                         >添加</el-button
                       >
                     </el-col>
@@ -188,37 +188,37 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="客房设施" prop="room_spec_ids" size="mini">
+          <el-form-item label="客房设施" prop="room_spec_tags" size="mini">
             <div class="clear-main">
               <div class="clear-left">
                 <el-checkbox
-                  :indeterminate="isIndeterminate.room_spec_ids"
-                  v-model="checkAll.room_spec_ids"
+                  :indeterminate="isIndeterminate.room_spec_tags"
+                  v-model="checkAll.room_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
-                    handleCheckAllChange($event, 'room_spec_ids', room_spec_ids_options)
+                    handleCheckAllChange($event, 'room_spec_tags', room_spec_tags_options)
                   "
                   >全选</el-checkbox
                 >
               </div>
               <div class="clear-right">
                 <el-checkbox-group
-                  v-model="ruleForm.room_spec_ids"
+                  v-model="ruleForm.room_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
                     handleCheckedCitiesChange(
                       $event,
-                      'room_spec_ids',
-                      room_spec_ids_options
+                      'room_spec_tags',
+                      room_spec_tags_options
                     )
                   "
                 >
                   <el-row>
                     <el-col
                       :span="3"
-                      v-for="(item, index) in room_spec_ids_options"
+                      v-for="(item, index) in room_spec_tags_options"
                       :key="item + index"
                     >
                       <el-checkbox style="margin: 0" size="mini" :label="item + ''">{{
@@ -229,7 +229,7 @@
                       <el-button
                       size="mini"
                         type="text"
-                        @click="openModal('room_spec_ids', '客房设施', room_spec_ids_options)"
+                        @click="openModal('room_spec_tags', '客房设施', room_spec_tags_options)"
                         >添加</el-button
                       >
                     </el-col>
@@ -238,19 +238,19 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="餐饮设施" prop="caterer_spec_ids" size="mini">
+          <el-form-item label="餐饮设施" prop="caterer_spec_tags" size="mini">
             <div class="clear-main">
               <div class="clear-left">
                 <el-checkbox
-                  :indeterminate="isIndeterminate.caterer_spec_ids"
-                  v-model="checkAll.caterer_spec_ids"
+                  :indeterminate="isIndeterminate.caterer_spec_tags"
+                  v-model="checkAll.caterer_spec_tags"
                   style="margin: 0"
                   size="mini"
                   @change="
                     handleCheckAllChange(
                       $event,
-                      'caterer_spec_ids',
-                      caterer_spec_ids_options
+                      'caterer_spec_tags',
+                      caterer_spec_tags_options
                     )
                   "
                   >全选</el-checkbox
@@ -258,21 +258,21 @@
               </div>
               <div class="clear-right">
                 <el-checkbox-group
-                  v-model="ruleForm.caterer_spec_ids"
+                  v-model="ruleForm.caterer_spec_tags"
                   size="mini"
                   style="margin: 0"
                   @change="
                     handleCheckedCitiesChange(
                       $event,
-                      'caterer_spec_ids',
-                      caterer_spec_ids_options
+                      'caterer_spec_tags',
+                      caterer_spec_tags_options
                     )
                   "
                 >
                   <el-row>
                     <el-col
                       :span="3"
-                      v-for="(item, index) in caterer_spec_ids_options"
+                      v-for="(item, index) in caterer_spec_tags_options"
                       :key="item + index"
                     >
                       <el-checkbox style="margin: 0" size="mini" :label="item + ''">{{
@@ -283,7 +283,7 @@
                       <el-button
                       size="mini"
                         type="text"
-                        @click="openModal('caterer_spec_ids', '餐饮设施', caterer_spec_ids_options)"
+                        @click="openModal('caterer_spec_tags', '餐饮设施', caterer_spec_tags_options)"
                         >添加</el-button
                       >
                     </el-col>
@@ -346,10 +346,10 @@ export default {
         ...isIndeterminate,
       },
       store_spec_ids_options: [],
-      caterer_spec_ids_options: config["caterer_spec_ids"],
-      hotel_spec_ids_options: config["hotel_spec_ids"],
-      room_spec_ids_options: config["room_spec_ids"],
-      caterer_spec_ids2_options: config["caterer_spec_ids2"],
+      caterer_spec_tags_options: config["caterer_spec_tags"],
+      hotel_spec_tags_options: config["hotel_spec_tags"],
+      room_spec_tags_options: config["room_spec_tags"],
+      conference_spec_tags_options: config["conference_spec_tags"],
       loading: false,
       showModel: false,
       hand_name: "",
@@ -388,22 +388,22 @@ export default {
               renovation_date,
               park_num,
               store_spec_ids,
-              caterer_spec_ids,
-              hotel_spec_ids,
-              room_spec_ids,
-              caterer_spec_ids2,
+              caterer_spec_tags,
+              hotel_spec_tags,
+              room_spec_tags,
+              conference_spec_tags,
               store_desc,
             } = this.sitem || {};
             this.hand_name = person || "";
             this.ruleForm = {
               // id: id || "",
               renovation_date: renovation_date || "",
-              park_num: park_num || "0",
+              park_num: park_num || 0,
               store_spec_ids: store_spec_ids || [],
-              caterer_spec_ids: caterer_spec_ids || [],
-              hotel_spec_ids: hotel_spec_ids || [],
-              room_spec_ids: room_spec_ids || [],
-              caterer_spec_ids2: caterer_spec_ids2 || [],
+              caterer_spec_tags: caterer_spec_tags || [],
+              hotel_spec_tags: hotel_spec_tags || [],
+              room_spec_tags: room_spec_tags || [],
+              conference_spec_tags: conference_spec_tags || [],
               store_desc: store_desc || "",
             };
           }
@@ -452,7 +452,7 @@ export default {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.store_id = this.store_id;
           // model.id = this.store_id;
-          model.park_num = 0;
+          // model.park_num = 0;
           console.log(model);
 
           let res = await asyncRequest.update(model);

src/views/operate/shopTrim/picture/index.vue

@@ -232,7 +232,7 @@ export default {
       const model = {
         ...this.parmValue,
         limit: this.parmValue.size,
-        type: "客房",
+        type: "详情图片",
         store_id: this.store_id,
       };
       const { code, data, msg } = await asyncRequest.list(model);