样式优化调整

src/components/PermissionButton/index.vue

@@ -13,8 +13,8 @@ export default {
   methods: {
     handleClick($event) {
       const { freeUseFlag, vipStatus } = this.$store.getters.vipInfo
-      // (已过期 or 非会员) and 非试用期
-      this.hasPermission = !((vipStatus === 0 || vipStatus === 3) && freeUseFlag === 0)
+      // 试用期 || 会员未到期
+      this.hasPermission = freeUseFlag > 0 || [0, 3].indexOf(vipStatus) === -1
       if (this.hasPermission) {
         this.$emit('click', $event)
       } else {

src/layout/components/AppMain.vue

@@ -28,7 +28,7 @@ export default {
   min-height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  overflow: hidden;
+  // overflow: hidden;
 }
 
 .fixed-header+.app-main {

src/layout/components/UserCard/index.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="info">
         <span v-if="vipInfo.endTime" class="time">会员到期时间：{{ vipInfo.endTime | formatTime }}</span>
-        <span class="record" @click="handleToRecord">购买记录</span>
+        <span v-if="vipInfo.vipStatus !== 3" class="record" @click="handleToRecord">购买记录</span>
       </div>
     </div>
   </div>

src/settings.js

@@ -17,7 +17,7 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether fix the header
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * @type {boolean} true | false

src/styles/index.scss

@@ -8,7 +8,7 @@
 
 body {
   height: 100%;
-  min-width: 1200px;
+  // min-width: 1200px;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;

src/views/admin/supplier/index.vue

@@ -46,8 +46,8 @@
       </div>
 
       <div class="filter-control">
-        <el-button size="mini" type="primary" @click="getList(listQuery)">查询</el-button>
-        <el-button size="mini" type="primary" @click="$_navigationTo('supplier-add')">添加供应商</el-button>
+        <el-button type="primary" @click="getList(listQuery)">查询</el-button>
+        <el-button type="primary" @click="$_navigationTo('supplier-add')">添加供应商</el-button>
       </div>
     </div>
     <!-- 表格区域 -->

src/views/normal/club/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="club-edit page-form-container">
-    <el-form ref="submitForm" label-width="120px" :model="formData" :rules="rules">
+    <el-form ref="submitForm" label-width="100px" :model="formData" :rules="rules">
       <el-form-item label="机构名称:" prop="name">
         <el-input v-model="formData.name" placeholder="请输入机构名称" clearable />
       </el-form-item>
@@ -162,7 +162,7 @@
     </el-form>
 
     <!-- 表单提交 返回 -->
-    <div class="submit-btn">
+    <div class="control-box">
       <el-button type="primary" @click="submit">保存</el-button>
       <el-button type="warning" @click="$_back()">返回</el-button>
     </div>
@@ -633,16 +633,6 @@ export default {
   height: 600px;
 }
 
-.club-edit {
-  margin-bottom: 80px;
-}
-
-.submit-btn {
-  text-align: center;
-  .el-button {
-    width: 140px;
-  }
-}
 .attributes {
   padding-top: 16px;
 }

src/views/normal/personal/index.vue

@@ -28,11 +28,13 @@
       </el-col>
     </el-row>
     <el-divider />
-    <el-row v-if="supplierInfo.shopType === 2">
-      <el-col :span="5">代理品牌：</el-col>
-      <el-col :span="8">{{ brandList }}</el-col>
-    </el-row>
-    <el-divider />
+    <template v-if="supplierInfo.shopType === 2">
+      <el-row>
+        <el-col :span="5">代理品牌：</el-col>
+        <el-col :span="8">{{ brandList }}</el-col>
+      </el-row>
+      <el-divider />
+    </template>
     <el-row>
       <el-col :span="5">会员状态：</el-col>
       <el-col :span="8">
@@ -61,7 +63,7 @@ export default {
   },
   computed: {
     brandList() {
-      return this.supplierInfo.shopInfo.map(item => item.brandName).join('/')
+      return this.supplierInfo.shopInfo.map((item) => item.brandName).join('/')
     }
   },
   created() {
@@ -70,7 +72,7 @@ export default {
   methods: {
     // 获取供应商信息
     fetchSupplierInfo() {
-      getSupplierById({ authUserId: this.$store.getters.authUserId }).then(res => {
+      getSupplierById({ authUserId: this.$store.getters.authUserId }).then((res) => {
         console.log(res)
         this.supplierInfo = res.data
       })

src/views/normal/personal/set-account.vue

@@ -1,15 +1,15 @@
 <template>
-  <div>
-    <el-form ref="form" :model="formData" :rules="formRules" label-width="120px" class="form">
+  <div class="page-form-container">
+    <el-form ref="form" :model="formData" :rules="formRules" label-width="120px">
       <el-form-item label="手机号" prop="mobile">
         <el-input v-model="formData.mobile" placeholder="请输入手机号" />
       </el-form-item>
       <el-form-item label="验证码" prop="verifyCode">
         <el-row>
-          <el-col :span="17">
+          <el-col :span="18">
             <el-input v-model="formData.verifyCode" placeholder="请输入验证码" />
           </el-col>
-          <el-col :span="7" class="send-code">
+          <el-col :span="6" class="send-code">
             <el-button type="primary" :disabled="sendStatus > 0" @click="handleSendVerifyCode">{{ sendCodeBtnText }}</el-button>
           </el-col>
         </el-row>
@@ -18,7 +18,7 @@
         <el-input v-model="formData.loginAccount" placeholder="请输入登录账号" />
       </el-form-item>
     </el-form>
-    <div class="submit-btn">
+    <div class="control-box">
       <el-button type="primary" @click="submit()">确认</el-button>
       <el-button type="warning" @click="$_back()">返回</el-button>
     </div>
@@ -112,17 +112,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.submit-btn {
-  text-align: center;
-  .el-button {
-    width: 140px;
-  }
-}
 .send-code {
   text-align: right;
 }
-.form {
-  width: 600px;
-  margin: 80px auto 0;
-}
 </style>

src/views/normal/personal/set-mobile.vue

@@ -1,15 +1,15 @@
 <template>
-  <div>
-    <el-form ref="form" :model="formData" :rules="formRules" label-width="80px" class="form">
+  <div class="page-form-container">
+    <el-form ref="form" :model="formData" :rules="formRules" label-width="80px">
       <el-form-item label="原手机号" prop="oldMobile">
         <el-input v-model="formData.oldMobile" placeholder="请输入原手机号" disabled />
       </el-form-item>
       <el-form-item label="验证码" prop="verifyCode">
         <el-row>
-          <el-col :span="17">
+          <el-col :span="18">
             <el-input v-model="formData.verifyCode" placeholder="请输入验证码" />
           </el-col>
-          <el-col :span="7" class="send-code">
+          <el-col :span="6" class="send-code">
             <el-button type="primary" @click="handleSendVerifyCode()">{{ sendCodeBtnText }}</el-button>
           </el-col>
         </el-row>
@@ -18,7 +18,7 @@
         <el-input v-model="formData.newMobile" placeholder="请输入新手机号" />
       </el-form-item>
     </el-form>
-    <div class="submit-btn">
+    <div class="control-box">
       <el-button type="primary" @click="submit()">确认</el-button>
       <el-button type="warning" @click="$_back()">返回</el-button>
     </div>
@@ -67,7 +67,7 @@ export default {
   },
   methods: {
     submit() {
-      this.$refs.form.validate(valide => {
+      this.$refs.form.validate((valide) => {
         if (!valide) return
         this.saveMobile()
       })
@@ -75,7 +75,7 @@ export default {
     // 保存
     saveMobile() {
       this.formData.authUserId = this.$store.getters.authUserId
-      resetMobile(this.formData).then(res => {
+      resetMobile(this.formData).then((res) => {
         this.$message.success('修改手机号成功')
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.back()
@@ -87,7 +87,7 @@ export default {
         this.$message.warning('请输入正确的手机号')
         return
       }
-      sendVerifyCode({ mobile: this.formData.oldMobile }).then(res => {
+      sendVerifyCode({ mobile: this.formData.oldMobile }).then((res) => {
         this.$message.success('验证码已发送')
         this.countdown()
       })
@@ -108,17 +108,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.submit-btn {
-  text-align: center;
-  .el-button {
-    width: 140px;
-  }
-}
 .send-code {
   text-align: right;
 }
-.form {
-  width: 600px;
-  margin: 80px auto 0;
-}
 </style>

src/views/normal/personal/vip-record.vue

@@ -177,7 +177,7 @@ export default {
     },
     fetchVipRecord() {
       console.log(this.listQuery)
-      fetchVipRecord(this.listQuery).then(res => {
+      fetchVipRecord(this.listQuery).then((res) => {
         console.log(res)
         this.list = [...this.list, ...res.data.list]
       })
@@ -185,7 +185,7 @@ export default {
     handleShowDemand(row) {
       this.dialogTableVisible = true
       if (row.services) {
-        this.demandList = row.services.split(',').map(item => ({
+        this.demandList = row.services.split(',').map((item) => ({
           demand: item
         }))
       } else {
@@ -194,18 +194,16 @@ export default {
     },
     // 获取套餐列表
     fetchConfigureList() {
-      fetchConfigureList().then(res => {
+      fetchConfigureList().then((res) => {
         this.packageList = res.data.packageList.map((item, index) => {
           item.name = `套餐${index + 1}`
-          // item.originalPrice = `${item.originalPrice.toFixed(2)}`
-          // item.price = item.price.toFixed(2)
           return item
         })
       })
     },
     // 获取供应商信息
     fetchSupplierInfo() {
-      getSupplierById({ authUserId: this.listQuery.authUserId }).then(res => {
+      getSupplierById({ authUserId: this.listQuery.authUserId }).then((res) => {
         console.log(res)
         this.supplierInfo = res.data
       })