v1.7版本接口调试

.env.development

@@ -2,9 +2,9 @@
 EVN = 'development'
 
 # 网站地址
-LOCALHOSE = 'https://zp-b.caimei365.com'
+# LOCALHOSE = 'https://zp-b.caimei365.com'
 # LOCALHOSE = 'http://192.168.2.81:8888'
-LOCALHOSE = 'http://192.168.2.56:8888'
+LOCALHOSE = 'http://192.168.2.92:8888'
 
 # 接口api地址
 # BASE_URL = 'https://zplma-b.caimei365.com'

layouts/app.vue

@@ -102,7 +102,7 @@ export default {
       this.$store.commit('user/SET_AUTH_USER_ID', authUserId)
 
       // 设置页面主题
-      if (authUserId === parseInt(17)) {
+      if (authUserId === parseInt(114)) {
         this.$store.commit('app/SET_PAGE_THEME', 'ross')
       }
 

pages/_template/app/form/club-register.vue

@@ -163,7 +163,7 @@ export default {
     },
 
     showPreButton() {
-      if(this.step === 1) return false
+      if (this.step === 1) return false
       if (this.step === 2) {
         if (this.registerType.indexOf(1) > -1) {
           return true
@@ -262,6 +262,8 @@ export default {
         // 已登录
         this.step = 2
         this.stepList = this.stepList.filter((item) => item.id !== 1)
+      } else {
+        this.registerType.push(1)
       }
 
       await this.initClubInfo({

pages/_template/app/form/components/form-club-info.vue

@@ -5,6 +5,8 @@
         <el-input
           placeholder="请输入机构名称"
           v-model="formData.name"
+          maxlength="50"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="mobile" label="联系电话:">

pages/_template/app/form/components/form-club-register.vue

@@ -28,6 +28,7 @@
           placeholder="密码"
           maxlength="12"
           show-word-limit
+          show-password
         ></el-input>
       </el-form-item>
       <el-form-item prop="confirmPwd">
@@ -37,6 +38,7 @@
           placeholder="再次输入密码"
           maxlength="12"
           show-word-limit
+          show-password
         ></el-input>
       </el-form-item>
     </el-form>

pages/_template/app/record/club/detail.vue

@@ -74,10 +74,10 @@
         <div class="row">
           <div class="col">状态：</div>
           <div class="col">
-            <div>
-              <span v-if="clubInfo.auditStatus === 1">认证成功</span>
-              <span v-else-if="clubInfo.auditStatus === 2">认证中</span>
-              <span v-else>认证失败</span>
+            <div class="status">
+              <span class="success" v-if="clubInfo.auditStatus === 1">认证成功</span>
+              <span class="warning" v-else-if="clubInfo.auditStatus === 2">认证中</span>
+              <span class="danger" v-else>认证失败</span>
             </div>
           </div>
         </div>
@@ -86,6 +86,7 @@
           <div
             class="button edit flex justify-center items-center mb-2"
             @click="onEdit"
+            v-if="clubInfo.auditStatus === 0"
           >
             编辑
           </div>
@@ -194,6 +195,18 @@ export default {
       font-size: 18px;
       margin: 24px 0;
 
+      .status {
+        .success {
+          color: #f3920d !important;
+        }
+        .warning {
+          color: #1890ff !important;
+        }
+        .danger {
+          color: #f94b4b !important;
+        }
+      }
+
       .col {
         &:first-child {
           width: 90px;
@@ -282,6 +295,18 @@ export default {
       margin-bottom: 5.6vw;
       flex-wrap: wrap;
 
+      .status {
+        .success {
+          color: #f3920d !important;
+        }
+        .warning {
+          color: #1890ff !important;
+        }
+        .danger {
+          color: #f94b4b !important;
+        }
+      }
+
       .col {
         &:first-child {
           width: 17vw;

pages/_template/app/record/device/detail.vue

@@ -14,7 +14,7 @@
         <div class="col">设备图片：</div>
         <div class="col">
           <el-image
-            :src="productInfo.originalCertificateImage"
+            :src="productInfo.productImage"
           ></el-image>
         </div>
       </div>
@@ -62,7 +62,7 @@
         <div class="col">{{ productInfo.invalidReason ? productInfo.invalidReason : '暂无' }}</div>
       </div>
 
-      <div class="control flex flex-col items-center"v-if="productInfo.auditStatus === 0">
+      <div class="control flex flex-col items-center" v-if="productInfo.auditStatus === 0">
         <div class="button edit flex justify-center items-center"  @click="onEdit">编辑</div>
       </div>
     </div>
@@ -287,6 +287,15 @@ export default {
       margin: 5.6vw 0;
 
       .col {
+        &.success {
+          color: #f3920d !important;
+        }
+        &.warning {
+          color: #1890ff !important;
+        }
+        &.danger {
+          color: #f94b4b !important;
+        }
         &:first-child {
           width: 19vw;
           color: #666;

themes/themeVariable.scss

@@ -1,114 +1,7 @@
-@import './variable.scss';
+@import './variables/normal.scss';
+@import './variables/ross.scss';
 
 $themes: (
-  normal: (
-    color: $color-red,
-    sub-color: #ffe6e8,
-    hover-color: $color-red-hover,
-    cover-color:
-      linear-gradient(180deg, #ffe6e8 0%, rgba(255, 255, 255, 0) 100%),
-    // pc端
-    icon-phone-active-pc:
-      url('https://static.caimei365.com/www/authentic/pc/icon-phone-active.png'),
-    icon-address-active-pc:
-      url('https://static.caimei365.com/www/authentic/pc/icon-address-active.png'),
-    icon-arround-right-pc:
-      url('https://static.caimei365.com/www/authentic/pc/icon-arround-right.png'),
-    banner-home-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-home.png'),
-    banner-approve-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
-    banner-club-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-club.png'),
-    banner-device-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-device.png'),
-    banner-personnel-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
-    banner-personnel-operate-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doctor.png'),
-    banner-database-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
-    banner-feedback-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
-    banner-club-register:
-      url('https://static.caimei365.com/www/authentic/pc/ross-bg-club-register.png'),
-    // 移动端
-    icon-phone-active-h5:
-      url('https://static.caimei365.com/www/authentic/h5/icon-phone-active.png'),
-    icon-address-active-h5:
-      url('https://static.caimei365.com/www/authentic/h5/icon-address-active.png'),
-    icon-arround-right-h5:
-      url('https://static.caimei365.com/www/authentic/h5/icon-arround-right.png'),
-    banner-home-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-home.png'),
-    banner-approve-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
-    banner-club-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-club.png'),
-    banner-device-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-device.png'),
-    banner-personnel-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
-    banner-personnel-operate-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doctor.png'),
-    banner-database-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
-    banner-feedback-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
-  ),
-  ross: (
-    color: $color-yellow,
-    hover-color: $color-yellow-hover,
-    sub-color: #ffebcf,
-    cover-color:
-      linear-gradient(180deg, #ffebcf 0%, rgba(255, 255, 255, 0) 100%),
-    // pc端
-    icon-phone-active-pc:
-      url('https://static.caimei365.com/www/authentic/pc/ross-icon-phone-active.png'),
-    icon-address-active-pc:
-      url('https://static.caimei365.com/www/authentic/pc/ross-icon-address-active.png'),
-    icon-arround-right-pc:
-      url('https://static.caimei365.com/www/authentic/pc/ross-icon-arround-right.png'),
-    banner-home-pc:
-      url('https://static.caimei365.com/www/authentic/pc/ross-bg-home.png'),
-    banner-approve-pc:
-      url('https://static.caimei365.com/www/authentic/pc/ross-bg-approve.png'),
-    banner-club-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-club.png'),
-    banner-device-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-device.png'),
-    banner-personnel-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
-    banner-personnel-operate-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doctor.png'),
-    banner-database-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
-    banner-feedback-pc:
-      url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
-    banner-club-register:
-      url('https://static.caimei365.com/www/authentic/pc/ross-bg-club-register.png'),
-    // 移动端
-    icon-phone-active-h5:
-      url('https://static.caimei365.com/www/authentic/h5/ross-icon-phone-active.png'),
-    icon-address-active-h5:
-      url('https://static.caimei365.com/www/authentic/h5/ross-icon-address-active.png'),
-    icon-arround-right-h5:
-      url('https://static.caimei365.com/www/authentic/h5/ross-icon-arround-right.png'),
-    banner-home-h5:
-      url('https://static.caimei365.com/www/authentic/h5/ross-bg-home.png'),
-    banner-approve-h5:
-      url('https://static.caimei365.com/www/authentic/h5/ross-bg-approve.png'),
-    banner-club-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-club.png'),
-    banner-device-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-device.png'),
-    banner-personnel-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
-    banner-personnel-operate-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doctor.png'),
-    banner-database-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
-    banner-feedback-h5:
-      url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
-  ),
+  normal: $mormalTuple,
+  ross: $rossTuple,
 );

themes/variable.scss

@@ -1,4 +0,0 @@
-$color-red: #bc1724;
-$color-red-hover: #960915;
-$color-yellow: #f3920d;
-$color-yellow-hover: #d68616;

themes/variables/normal.scss

@@ -0,0 +1,54 @@
+$mormalTuple: (
+  color: #bc1724,
+  sub-color: #ffe6e8,
+  hover-color: #960915,
+  cover-color: linear-gradient(180deg, #ffe6e8 0%, rgba(255, 255, 255, 0) 100%),
+  // pc端
+  icon-phone-active-pc:
+    url('https://static.caimei365.com/www/authentic/pc/icon-phone-active.png'),
+  icon-address-active-pc:
+    url('https://static.caimei365.com/www/authentic/pc/icon-address-active.png'),
+  icon-arround-right-pc:
+    url('https://static.caimei365.com/www/authentic/pc/icon-arround-right.png'),
+  banner-home-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-home.png'),
+  banner-approve-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
+  banner-club-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-club.png'),
+  banner-device-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-device.png'),
+  banner-personnel-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
+  banner-personnel-operate-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doctor.png'),
+  banner-database-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
+  banner-feedback-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
+  banner-club-register:
+    url('https://static.caimei365.com/www/authentic/pc/ross-bg-club-register.png'),
+  // 移动端
+  icon-phone-active-h5:
+    url('https://static.caimei365.com/www/authentic/h5/icon-phone-active.png'),
+  icon-address-active-h5:
+    url('https://static.caimei365.com/www/authentic/h5/icon-address-active.png'),
+  icon-arround-right-h5:
+    url('https://static.caimei365.com/www/authentic/h5/icon-arround-right.png'),
+  banner-home-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-home.png'),
+  banner-approve-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
+  banner-club-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-club.png'),
+  banner-device-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-device.png'),
+  banner-personnel-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
+  banner-personnel-operate-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doctor.png'),
+  banner-database-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
+  banner-feedback-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
+);

themes/variables/ross.scss

@@ -0,0 +1,54 @@
+$rossTuple: (
+  color: #f3920d,
+  hover-color: #d68616,
+  sub-color: #ffebcf,
+  cover-color: linear-gradient(180deg, #ffebcf 0%, rgba(255, 255, 255, 0) 100%),
+  // pc端
+  icon-phone-active-pc:
+    url('https://static.caimei365.com/www/authentic/pc/ross-icon-phone-active.png'),
+  icon-address-active-pc:
+    url('https://static.caimei365.com/www/authentic/pc/ross-icon-address-active.png'),
+  icon-arround-right-pc:
+    url('https://static.caimei365.com/www/authentic/pc/ross-icon-arround-right.png'),
+  banner-home-pc:
+    url('https://static.caimei365.com/www/authentic/pc/ross-bg-home.png'),
+  banner-approve-pc:
+    url('https://static.caimei365.com/www/authentic/pc/ross-bg-approve.png'),
+  banner-club-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-club.png'),
+  banner-device-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-device.png'),
+  banner-personnel-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-approve.png'),
+  banner-personnel-operate-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doctor.png'),
+  banner-database-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
+  banner-feedback-pc:
+    url('https://static.caimei365.com/www/authentic/pc/bg-doc.png'),
+  banner-club-register:
+    url('https://static.caimei365.com/www/authentic/pc/ross-bg-club-register.png'),
+  // 移动端
+  icon-phone-active-h5:
+    url('https://static.caimei365.com/www/authentic/h5/ross-icon-phone-active.png'),
+  icon-address-active-h5:
+    url('https://static.caimei365.com/www/authentic/h5/ross-icon-address-active.png'),
+  icon-arround-right-h5:
+    url('https://static.caimei365.com/www/authentic/h5/ross-icon-arround-right.png'),
+  banner-home-h5:
+    url('https://static.caimei365.com/www/authentic/h5/ross-bg-home.png'),
+  banner-approve-h5:
+    url('https://static.caimei365.com/www/authentic/h5/ross-bg-approve.png'),
+  banner-club-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-club.png'),
+  banner-device-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-device.png'),
+  banner-personnel-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-approve.png'),
+  banner-personnel-operate-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doctor.png'),
+  banner-database-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
+  banner-feedback-h5:
+    url('https://static.caimei365.com/www/authentic/h5/bg-doc.png'),
+);