'全面了解中德'

src/pages/about/index.vue

@@ -20,7 +20,7 @@ export default {
         },
         {
           imgUrl: require('@/static/img/about/about_img2.png'),
-          height: 1024
+          height: 480
         },
         {
           imgUrl: require('@/static/img/about/about_img3.png'),

src/pages/contact/index.vue

@@ -39,11 +39,19 @@
               <image class="arrow" src="/static/img/contact/down.png" mode="aspectFill" />
             </view>
           </view>
-          <view class="input-content">
-            <view class="iconfont">
-              <image class="image" src="/static/img/contact/icon_04.png" mode="aspectFill" />
+          <view class="area-content">
+            <view class="area-label flex align-center">
+              <view class="iconfont">
+                <image class="image" src="/static/img/contact/icon_04.png" mode="aspectFill" />
+              </view>
+              <view class="label-info">您的意向</view>
             </view>
-            <view class="area flex align-center">
+            <view class="area-select flex flex-wrap">
+              <view :class="['select',  item.checked ? 'checked' : '' ]" v-for="(item, index) in typeList" :key="index" @tap.stop="handleSelect(index, item)">
+                {{ item.label }}
+              </view>
+            </view>
+            <!-- <view class="area flex align-center">
               <picker mode="selector" name="type" @change="typeChange" :value="typeIndex" :range="typeList" range-key="label">
                 <view class="empty" v-if="typeIndex == -1">
                   {{ '您的意向' }}
@@ -52,9 +60,8 @@
                   {{ typeList[typeIndex] }}
                 </view>
               </picker>
-              <!-- <input class="uni-input" v-model="form.parentName" name="parentName" placeholder="您的意向" /> -->
               <image class="arrow" src="/static/img/contact/down.png" mode="aspectFill" />
-            </view>
+            </view> -->
           </view>
           <view class="submit-btn">
             <image src="/static/img/contact/submit.png" mode="aspectFill" />
@@ -95,8 +102,31 @@ export default {
       region:[],
       defaultRegionCode: '110101',
       defaultRegion:['北京市','市辖区','东城区'],
-      typeIndex: -1,
-      typeList: ["教学渠道代理", "思维芯游戏教室渠道代理", "家庭版渠道代理", "HOME&PLUS渠道代理", "探索小镇渠道代理(TOWN)", "合作园所(北京地区园所)"],
+      typeIndex: 0,
+      // typeList: ["教学渠道代理", "思维芯游戏教室渠道代理", "家庭版渠道代理", "HOME&PLUS渠道代理", "探索小镇渠道代理(TOWN)", "合作园所(北京地区园所)"],
+      // “思维芯”四大课程体,思维芯游戏教室,家庭版产品,逻辑狗思维游戏HOME&PLUS馆,逻辑狗·探索小镇,合作园所（北京地区园所）
+      typeList: [
+        {
+          label: '“思维芯”四大课程体系',
+          checked: true
+        },
+        {
+          label: '家庭版产品',
+          checked: false
+        },
+        {
+          label: '逻辑狗·探索小镇',
+          checked: false
+        },
+        {
+          label: '思维芯游戏教室',
+          checked: false
+        },
+        {
+          label: '逻辑狗思维游戏HOME&PLUS馆',
+          checked: false
+        }
+      ],
       reqBody: {}
     }
   },
@@ -129,25 +159,11 @@ export default {
   },
   methods: {
     formSubmit(e) {
-      console.log(e.detail.value);
-      console.log(this.typeIndex);
-      // {
-      //   "entity": {
-      //     "customer_name": "李哈哈测试22",
-      //     "mobile": "13120373714",
-      //     "address": "xxxxx"
-      //   },
-      //   "field": [{
-      //     "fieldId": 135,
-      //     "fieldName": "代理商类型",
-      //     "value": "教学渠道代理",
-      //   }]
-      // }
       let formData = e.detail.value;
       let rules = [
         { name: 'customerName', checkType: 'notnull', checkRule: '', errorMsg: '请填写姓名' },
         { name: 'customerName', checkType: 'string', checkRule: '2,8', errorMsg: '请输入2-8位姓名' },
-        { name: 'type', checkType: 'in', checkRule: '0, 1, 2, 3, 4, 5', errorMsg: '意向不能为空' },
+        // { name: 'type', checkType: 'in', checkRule: '0, 1, 2, 3, 4, 5', errorMsg: '意向不能为空' },
         { name: 'mobile', checkType: 'notnull', checkRule: '', errorMsg: '请填写联系方式'},
         { name: 'mobile', checkType: 'phoneno', checkRule: '', errorMsg: '联系方式不正确'},
       ]
@@ -166,7 +182,9 @@ export default {
         this.$mHelper.toast(this.$mGraceChecker.error);
         return false;
       }
-      if (this.typeIndex == -1) {
+      // 判断意向
+      let typeRes = this.checkType();
+      if (!typeRes) {
         this.$mHelper.toast('请选择您的意向');
         return false;
       }
@@ -177,13 +195,21 @@ export default {
         address: this.region.map(item=>item.name).join(',')
       };
 
+      const typeValue = this.typeList.filter(item => {
+          return item.checked
+        }).map(
+          item => {
+            return item.label
+          }
+        ).join(',');
+
       let field = [{
         fieldId: 135,
         name: "代理商类型",
-        value: this.typeList[this.typeIndex]
+        value: typeValue
       }];
 
-      if (checkRes && regionRes && this.typeIndex != -1) {
+      if (checkRes && regionRes && typeRes) {
         this.disabled = true;
         this.$http.post(saveApply, {
           entity,
@@ -193,7 +219,6 @@ export default {
           this.$refs.resrtBtn.$dispatch('Form', 'uni-form-reset', {
             type: 'reset'
           })
-          this.typeIndex = -1;
           this.region = [];
           this.disabled = false;
         }).catch(err => {
@@ -205,11 +230,23 @@ export default {
     typeChange(e) {
       const index = e.detail.value;
       this.typeIndex = index;
-      // this.form.sex = this.genderList[index].value;
+    },
+    checkType() {
+      let checkedArr = this.typeList.filter(item => {
+        return item.checked
+      })
+      if (checkedArr.length > 0) {
+        return true
+      }
+      return false
     },
     // 获取选择的地区
     handleGetRegion(region){
       this.region = region
+    },
+    handleSelect(index) {
+      const target = this.typeList[index];
+      target['checked'] = !target['checked'];
     }
   }
 }
@@ -264,7 +301,7 @@ export default {
         background:#B9B9B9;
         border-radius: 4upx;
         position: absolute;
-        top: 4upx;
+        top: 6upx;
         right: -26upx;
       }
       image {
@@ -315,6 +352,69 @@ export default {
       vertical-align: middle;
     }
   }
+  .area-content {
+    border: 2upx solid #003F66;
+    margin-bottom: 36upx;
+    padding: 28upx 42upx 40upx 42upx;
+    background: #FFFFFF;
+    border-radius: 32upx;
+    .area-label {
+      .label-info {
+        font-size: 28upx;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #333333;
+        line-height: 36upx;
+      }
+    }
+    .iconfont {
+      position: relative;
+      margin-right: 52upx;
+      &::after {
+        content: "";
+        width: 2upx;
+        height: 34upx;
+        background:#B9B9B9;
+        border-radius: 4upx;
+        position: absolute;
+        top: 6upx;
+        right: -26upx;
+      }
+      image {
+        width: 40upx;
+        height: 46upx;
+        vertical-align: middle;
+      }
+    }
+    .area-select {
+      margin-top: 34upx;
+      .select {
+        height: 48upx;
+        border-radius: 24upx;
+        border: 2upx solid rgba(153, 153, 153, 0.2);
+        font-size: 28upx;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999999;
+        line-height: 48upx;
+        padding: 0 16upx;
+        margin-bottom: 20upx;
+        margin-right: 16upx;
+        &.checked {
+          height: 48upx;
+          line-height: 48upx;
+          background: #FDD600;
+          border-radius: 24upx;
+          border: 2upx solid #333333;
+          font-size: 28upx;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333333;
+          transition: background 0.3s;
+        }
+      }
+    }
+  }
   .submit-btn {
     position: relative;
     margin-top: 94upx;

src/pages/course/index.vue

@@ -130,8 +130,8 @@ export default {
         padding-top: 20upx;
         .info-title {
           font-size: 36upx;
-          font-family: HelloFont-WenYiHei, HelloFont;
-          font-weight: normal;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
           color: #050505;
           line-height: 46upx;
           letter-spacing: 1upx;

src/pages/join/index.vue

@@ -87,7 +87,8 @@ export default {
 .join {
   background: url('@/static/img/common/bg.png') no-repeat #01A2E8;
   background-size: cover;
-  height: 100vh;
+  // height: 100vh;
+  padding-bottom: 408upx;
   .head-top {
     image {
       width: 100%;

src/static/css/colorui/main.css

@@ -13,7 +13,7 @@
 body {
 	font-size: 28upx;
 	color: #333333;
-	font-family: Helvetica Neue, Helvetica, sans-serif;
+	font-family: "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
 }
 
 view,