Merge branch 'master' of https://dd.tall.wiki/gitea/song/wiki

src/components/HeadNav/HeadNav.vue

@@ -25,7 +25,33 @@
       </a-dropdown>
     </div>
     <div class="d-flex flex-nowrap align-center">
-      <a-icon class="icon-head pointer icon-head-right" type="search" />
+      <div class="d-flex flex-column justify-center" style="position:relative">
+        <a-icon
+          @mouseover="showSearch = true"
+          class="icon-head pointer icon-head-right"
+          type="search"
+          v-show="!showSearch"
+        />
+        <a-input-group
+          class="icon-head-right d-flex flex-nowrap"
+          compact
+          style="position: absolute;right:0;z-index:9;width: 156px;"
+          v-show="showSearch"
+        >
+          <a-select @change="changeCode" style="width: 120px;">
+            <a-select-option value="1">政策</a-select-option>
+            <a-select-option value="2">活动</a-select-option>
+            <a-select-option value="3">学习</a-select-option>
+          </a-select>
+          <a-button
+            icon="search"
+            style="width: 36px;color: #d9d9d9 !important; border-color: #d9d9d9 !important;"
+          ></a-button>
+          <!-- <a-input-search class="flex-1" placeholder="请输入..." style="width: 150px" /> -->
+          <!-- @search="getPolicy" -->
+        </a-input-group>
+      </div>
+
       <a-tooltip placement="bottom">
         <template slot="title">
           <span>点击查看购物车！</span>
@@ -163,6 +189,7 @@ export default {
           url: '/ContactUs',
         },
       ],
+      showSearch: false,
     };
   },
   methods: {
@@ -171,6 +198,18 @@ export default {
         this.$router.push(url);
       }
     },
+
+    // 政策界面课程类目搜索提示
+    changeCode(value) {
+      this.showSearch = false;
+      if (value === '1') {
+        this.$router.push('/Policy');
+      } else if (value === '2') {
+        this.$router.push('/Activity');
+      } else {
+        this.$router.push('/Study');
+      }
+    },
   },
 };
 </script>

src/components/Introduce/AddShopping.vue

@@ -37,6 +37,10 @@ const formTailLayout = {
 export default {
   name: 'NewModel',
   props: {
+    serviceId: {
+      type: Number,
+      default: 0,
+    },
     typeData: {
       type: Object,
       default: null,
@@ -77,7 +81,7 @@ export default {
         const params = {
           param: {
             description: this.describe,
-            serviceId: this.typeData.Id,
+            serviceId: this.serviceId ? this.serviceId : this.typeData.Id,
             type: this.typeData.type,
           },
         };

src/components/Introduce/IntentionModel.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <a-button @click="showModal">{{ typeData.type === 1 ? '意向填报' : '直接申请' }}</a-button>
+    <a-button @click="showModal">直接申请</a-button>
     <a-modal
       :confirm-loading="confirmLoading"
-      :title="typeData.type === 1 ? '意向填报' : '产品购买'"
       :visible="visible"
       @cancel="handleCancel"
       @ok="handleOk"
+      title="服务申请"
       width="50%"
     >
       <a-form :form="form">
@@ -35,7 +35,7 @@
             @change="changePhone"
             placeholder="请输入联系电话.."
             type="tel"
-            v-decorator="['tel', { rules: phoneRules }]"
+            v-model.trim="platform.tel"
           />
         </a-form-item>
         <a-form-item
@@ -132,6 +132,11 @@ export default {
       type: Object,
       default: null,
     },
+
+    serviceId: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
@@ -164,7 +169,10 @@ export default {
       ],
     };
   },
-  computed: mapState('user', ['picCode']),
+  computed: {
+    ...mapState('user', ['picCode']),
+    ...mapState('home', ['userSer']),
+  },
   async created() {
     this.sendPicCode();
     await this.getUserSer();
@@ -230,7 +238,7 @@ export default {
             contactPhone: this.platform.tel,
             description: this.platform.describe,
             filesId: this.platform.files,
-            serviceId: this.typeData.Id,
+            serviceId: this.serviceId ? this.serviceId : this.typeData.Id,
             type: this.typeData.type,
           },
         };

src/components/User/MechanismSignUp.vue

@@ -137,7 +137,7 @@
           <div class="d-flex flex-wrap" style="width: 75%">
             <div class="flex-1"></div>
             <router-link tag="span" to="/login">
-              <span class="baseColor">已有账号，去登录</span>
+              <span class="baseColor pointer">已有账号，去登录</span>
             </router-link>
           </div>
         </div>

src/components/User/PersonalSignUp.vue

@@ -117,7 +117,7 @@
           <div class="d-flex flex-wrap" style="width: 75%">
             <div class="flex-1"></div>
             <router-link tag="span" to="/login">
-              <span class="baseColor">已有账号，去登录</span>
+              <span class="baseColor pointer">已有账号，去登录</span>
             </router-link>
           </div>
         </div>

src/views/Cart/Cart.vue

@@ -20,22 +20,18 @@
         <a-input style="width: 200px" v-model="company" />
       </div>
     </div>
-    <div class="cart-box" v-if="cart.lists && cart.lists.length > 0">
+    <div class="cart-box" v-if="cart && cart.length > 0">
-      <div
+      <div :key="list.id" class="d-flex flex-column pa-5 white div-box mb-8" v-for="list in cart">
-        :key="list.id"
+        <p class="font-bold-20 title-color">服务</p>
-        class="d-flex flex-column pa-5 white div-box mb-8"
-        v-for="list in cart.lists"
-      >
-        <p class="font-bold-20 title-color">{{ list.title }}</p>
         <div
           :key="index"
           class="d-flex flex-nowrap flex-row mb-8"
-          v-for="(item, index) in list.list"
+          v-for="(item, index) in list.carDetailList"
         >
-          <img :src="item.src" class="cart-pic mr-8" />
+          <img :src="item.picUrl" class="cart-pic mr-8" />
           <div class="flex-1 flex-column">
-            <p class="font-bold-20 title-color">{{ item.title }}</p>
+            <p class="font-bold-20 title-color">{{ item.name }}</p>
-            <p class="font-14 textColor">{{ item.content }}</p>
+            <p class="font-14 textColor">{{ item.description }}</p>
           </div>
         </div>
       </div>
@@ -104,6 +100,7 @@ export default {
         const { data, msg, code } = res.data;
         if (code === 200) {
           this.cart = data;
+          console.log('this.cart: ', this.cart);
         }
       } catch (error) {
         console.log(error);
@@ -130,8 +127,7 @@ export default {
           this.phone = tel;
         }
         const { name, phone, company, cart } = this;
-        const ids = [];
+        const ids = cart[0].carId;
-        ids.push(cart.id);
         const params = {
           param: {
             contactName: company,
@@ -140,6 +136,7 @@ export default {
             ids,
           },
         };
+        console.log('params: ', params);
         const res = await carAndBuy(params);
         const { data, msg, code } = res.data;
         if (code === 200) {

src/views/Hatch/Children/Tutor.vue

@@ -15,7 +15,11 @@
           class="teacher-box font-24 mb-3"
           v-for="(item, index) in teacher.services"
         >
-          <div :class="index === 0 ? 'teacher-item-active' : ''" class="teacher-item font-24 mb-3">
+          <div
+            :class="index === 0 ? 'teacher-item-active' : ''"
+            @click="showProfile = true"
+            class="teacher-item font-24 mb-3"
+          >
             <div class="font-26 teacher-title mb-5">{{ item.name }}</div>
             <div class="font-14 teacher-txt">
               会组成按理事会章程执行，经理
@@ -31,6 +35,21 @@
               <img src="~assets/teacher02.png" v-else />
             </div>
           </div>
+          <a-modal
+            :footer="null"
+            :title="item.name"
+            :visible="showProfile"
+            @cancel="handleCancel"
+            @ok="handleCancel"
+            width="50%"
+          >
+            <p class="line-height-30">
+              会组成按理事会章程执行，经理
+              层设总经理 1 名、会组成按理事
+              会章程执行，经理层设总经理 1
+              名导师。
+            </p>
+          </a-modal>
         </div>
       </div>
     </div>
@@ -52,6 +71,7 @@ export default {
         { name: '创业导师', url: '' },
       ],
       teachers: [],
+      showProfile: false,
     };
   },
 
@@ -60,6 +80,10 @@ export default {
   },
 
   methods: {
+    handleCancel() {
+      this.showProfile = false;
+    },
+
     // 查询 导师
     async handleTeacher() {
       try {
@@ -71,7 +95,7 @@ export default {
             const element = this.teachers[i];
             for (let j = 0; j < element.services.length; j++) {
               for (let k = 0; k < element.services.length - j; k++) {
-                if (element.services[k].order > element.services[k + 1].order) {
+                if (element.services[k].order && element.services[k].order > element.services[k + 1].order) {
                   let a = {};
                   a = element.services[k + 1].order;
                   element.services[k + 1].order = element.services[k].order;
@@ -115,8 +139,11 @@ export default {
 
   .teacher-txt {
     text-align: justify;
-    height: 105px;
+    height: 85px;
     overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
   }
 
   span {

src/views/ServiceMarket/Children/InnovativeService.vue

@@ -3,8 +3,8 @@
     <left-nav />
     <div class="flex-1">
       <div class="content-box fill-width pa-3">
-        <div :key="index" style="cursor: pointer" v-for="(item, index) in list">
+        <div :key="index" v-for="(item, index) in list">
-          <div @click="jump(item.id)" class="pointer d-flex flex-nowrap justify-space-between">
+          <div class="d-flex flex-nowrap justify-space-between">
             <div class="d-flex flex-column justify-center py-3">
               <img :src="item.picUrl" style="width: 330px;height:173px" />
             </div>
@@ -13,6 +13,10 @@
               <p class="font-16 line-height-30" v-dompurify-html="item.intro">{{ item.intro }}</p>
             </div>
           </div>
+          <div class="d-flex flex-row-reverse">
+            <add-shopping :service-id="item.id" :type-data="typeData" />
+            <intention-model :service-id="item.id" :type-data="typeData" class="mr-3" />
+          </div>
           <a-divider v-if="index !== (list.length - 1)" />
         </div>
       </div>
@@ -24,14 +28,20 @@
 import { mapMutations } from 'vuex';
 import { selService } from 'config/api';
 import LeftNav from './../components/LeftNav.vue';
+import IntentionModel from 'components/Introduce/IntentionModel.vue';
+import AddShopping from 'components/Introduce/AddShopping.vue';
 
 export default {
   name: 'InnovativeService',
-  components: { LeftNav },
+  components: { LeftNav, IntentionModel, AddShopping },
   data() {
     return {
       title: '服务超市-科技创新服务',
       list: [],
+      typeData: {
+        type: 0,
+        Id: '',
+      },
     };
   },
 
@@ -54,14 +64,6 @@ export default {
         console.log(data);
       }
     },
-    // 查看 服务 详情
-    jump(id) {
-      this.$router.push({
-        path: '/NewPlatform/ServiceDet',
-        name: 'ServiceDet',
-        params: { id },
-      });
-    },
   },
 };
 </script>

src/views/ServiceMarket/Children/ServiceDet.vue

@@ -12,10 +12,10 @@
       <p class="service-eng">SERVICE</p>
     </div>
     <div class="inner service-box">
-      <!-- <div style="margin-bottom: 40px" v-dompurify-html="obj.content"></div> -->
+      <div style="margin-bottom: 40px" v-dompurify-html="obj.content"></div>
-      <div style="margin-bottom: 40px">
+      <!-- <div
-        研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心
+        style="margin-bottom: 40px"
-      </div>
+      >研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心</div>-->
       <div>
         <!-- <a-button>直接申请</a-button> -->
         <intention-model :type-data="typeData" style="float: left; margin-right: 20px" />
@@ -24,9 +24,7 @@
       </div>
       <div class="mt-10" style="margin-top: 40px">
         <p class="font-30">服务案例</p>
-        <div>
+        <div>研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心</div>
-          研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心
-        </div>
       </div>
     </div>
   </div>

src/views/User/ForgetPassword.vue

@@ -3,10 +3,10 @@
     <div class="d-flex flex-column box">
       <!-- 修改密码 -->
       <div class="d-flex justify-center my-4">
-        <a-button class="d-flex flex-column baseColor" type="link">
+        <div class="d-flex flex-column baseColor pa-3">
           <span>修改密码</span>
           <div class="head-top mt-1"></div>
-        </a-button>
+        </div>
       </div>
       <!-- 修改密码 -->
       <a-row class="d-flex flex-nowrap mt-4" type="flex">
@@ -86,11 +86,11 @@
           <div class="d-flex flex-row-reverse mt-1">
             <div class="d-flex flex-wrap" style="width: 75%">
               <router-link tag="span" to="/register">
-                <span class="baseColor">新用户注册</span>
+                <span class="baseColor pointer">新用户注册</span>
               </router-link>
               <div class="flex-1"></div>
               <router-link tag="span" to="/login">
-                <span class="textColor">返回登录</span>
+                <span class="textColor pointer">返回登录</span>
               </router-link>
             </div>
           </div>

src/views/User/Login.vue

@@ -3,39 +3,83 @@
     <div class="d-flex flex-column box">
       <!-- 切换登录方式 -->
       <div class="d-flex justify-center my-4">
-        <a-button :class="type === 1 ? 'baseColor ' : 'textColor'" @click="type = 1" class="d-flex flex-column" type="link">
+        <div
+          :class="type === 1 ? 'baseColor ' : 'textColor'"
+          @click="type = 1"
+          class="d-flex flex-column pointer pa-3"
+        >
           <span>免密登录</span>
           <div class="head-top mt-1" v-if="type === 1"></div>
-        </a-button>
+        </div>
-        <a-button :class="type === 3 ? 'baseColor ' : 'textColor'" @click="type = 3" class="d-flex flex-column" type="link">
+        <div
+          :class="type === 3 ? 'baseColor ' : 'textColor'"
+          @click="type = 3"
+          class="d-flex flex-column pointer pa-3"
+        >
           <span>账号登录</span>
           <div class="head-top mt-1" v-if="type === 3"></div>
-        </a-button>
+        </div>
       </div>
       <!-- 免密登录 -->
       <a-row class="d-flex flex-nowrap mt-4" type="flex" v-if="type === 1">
         <a-col :span="8" class="explain" flex="auto">
           <!-- <a-form :form="form" v-model="valid"> -->
           <a-form :form="form" @submit="handleSignIn">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="手机号">
+            <a-form-item
-              <a-input @change="changePhone" placeholder="请输入手机号" type="tel" v-decorator="['identifier', { rules: phoneRules }]" />
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="手机号"
+            >
+              <a-input
+                @change="changePhone"
+                placeholder="请输入手机号"
+                type="tel"
+                v-decorator="['identifier', { rules: phoneRules }]"
+              />
             </a-form-item>
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="图片验证码"
+              required
+            >
               <div class="d-flex flex-nowrap">
                 <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-                <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
+                <img
+                  :src="picCode.imageBase64"
+                  @click="changePicCode"
+                  class="code_img ml-2"
+                  v-if="picCode && picCode.imageBase64"
+                />
                 <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
                 <!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
               </div>
             </a-form-item>
 
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="短信验证码"
+            >
               <div class="d-flex flex-nowrap">
-                <a-input placeholder="请输入验证码" type="number" v-decorator="['credential', { rules: codeRules }]" />
+                <a-input
-                <a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
+                  placeholder="请输入验证码"
-                <a-button :disabled="identifier && identifier.length !== 11" @click="getCode" class="ml-2" type="primary" v-else>
+                  type="number"
-                  获取验证码
+                  v-decorator="['credential', { rules: codeRules }]"
-                </a-button>
+                />
+                <a-button
+                  class="ml-2"
+                  disabled
+                  type="primary"
+                  v-if="showInterval"
+                >重新发送 {{ interval }}</a-button>
+                <a-button
+                  :disabled="identifier && identifier.length !== 11"
+                  @click="getCode"
+                  class="ml-2"
+                  type="primary"
+                  v-else
+                >获取验证码</a-button>
               </div>
             </a-form-item>
             <!-- <a-form-item
@@ -55,11 +99,11 @@
           <div class="d-flex flex-row-reverse mt-1">
             <div class="d-flex flex-wrap" style="width: 75%">
               <router-link tag="span" to="/register">
-                <span class="baseColor">新用户注册</span>
+                <span class="baseColor pointer">新用户注册</span>
               </router-link>
               <div class="flex-1"></div>
               <router-link tag="span" to="/forget-password">
-                <span class="textColor">忘记密码</span>
+                <span class="textColor pointer">忘记密码</span>
               </router-link>
             </div>
           </div>
@@ -75,14 +119,25 @@
       <a-row class="d-flex flex-nowrap mt-4" type="flex" v-if="type === 3">
         <a-col :span="8" class="explain" flex="auto">
           <a-form :form="form" @submit="handleSignIn">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="账号">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="账号"
+            >
               <a-input
                 placeholder="请输入用户名/手机号"
                 v-decorator="['identifier', { rules: [{ required: true, message: '请输入用户名/手机号' }] }]"
               />
             </a-form-item>
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="密码">
+            <a-form-item
-              <a-input-password placeholder="请输入6-16位数字和字母密码" v-decorator="['credential', { rules: passwordRules }]" />
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="密码"
+            >
+              <a-input-password
+                placeholder="请输入6-16位数字和字母密码"
+                v-decorator="['credential', { rules: passwordRules }]"
+              />
             </a-form-item>
             <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="来源">
               <a-select placeholder="请选择来源" v-decorator="['source']">

src/views/User/Register.vue

@@ -3,14 +3,22 @@
     <div class="d-flex flex-column box1">
       <!-- 切换注册方式 -->
       <div class="d-flex justify-center my-4">
-        <a-button :class="type === 1 ? 'baseColor ' : 'textColor'" @click="type = 1" class="d-flex flex-column" type="link">
+        <div
+          :class="type === 1 ? 'baseColor ' : 'textColor'"
+          @click="type = 1"
+          class="d-flex flex-column pa-3 pointer"
+        >
           <span>个人注册</span>
           <div class="head-top mt-1" v-if="type === 1"></div>
-        </a-button>
+        </div>
-        <a-button :class="type === 3 ? 'baseColor ' : 'textColor'" @click="type = 3" class="d-flex flex-column" type="link">
+        <div
+          :class="type === 3 ? 'baseColor ' : 'textColor'"
+          @click="type = 3"
+          class="d-flex flex-column pa-3 pointer"
+        >
           <span>机构注册</span>
           <div class="head-top mt-1" v-if="type === 3"></div>
-        </a-button>
+        </div>
       </div>
       <!-- 免密登录 -->
       <personal-sign-up v-if="type === 1" />
@@ -34,7 +42,7 @@ const formTailLayout = {
 
 export default {
   name: 'Register',
-  components: { personalSignUp, mechanismSignUp },
+  components: { PersonalSignUp, MechanismSignUp },
   data() {
     return {
       formItemLayout,