Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

config/sit.env.js

@@ -1,7 +1,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
-  BASE_API: '"http://api.test1.sgjyun.com"',
+  BASE_API: '"http://api.jk.test.sgjyun.com"',
 
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

src/scrm_pages/activity/activity.vue

@@ -51,15 +51,18 @@ export default {
     staffCreateTime(time) {
       return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
     },
-    singleActivitInfo(id, orgid) {
-      this.$router.push({
-        path: "/activityDetail",
-        query: {
-          id: id,
-          orgid,
-          orgid
-        }
-      });
+    // singleActivitInfo(id, orgid) {
+    //   this.$router.push({
+    //     path: "/activityDetail",
+    //     query: {
+    //       id: id,
+    //       orgid,
+    //       orgid
+    //     }
+    //   });
+    // }
+    singleActivitInfo(id){
+      window.location.href = "http://wx.kuyicloud.com/weixin/activity/"+id;
     }
   },
   created() {

src/scrm_pages/contact/contact.vue

@@ -1,16 +1,11 @@
 <template>
   <div>
-    <div class="focusImg">
+    <div v-for="item in this.ordmodel" :key="item.id" >
+    <div class="focusImg" v-if="item.mode_type == 1">
       <div class="swiper-container">
         <div class="swiper-wrapper">
-          <div class="swiper-slide">
-            <img class="imgtwo" src="/static/images/banner.jpg" />
-          </div>
-          <div class="swiper-slide">
-            <img class="imgtwo" src="/static/images/img3.jpg" />
-          </div>
-          <div class="swiper-slide">
-            <img class="imgtwo" src="/static/images/home.jpg" />
+          <div class="swiper-slide"  v-for="it in item.Conrotation" :key="it.id">
+            <img class="imgtwo" :src="it.images"/>
           </div>
         </div>
         <!-- 如果需要分页器 -->
@@ -18,59 +13,25 @@
       </div>
     </div>
     <!-- <div class="detail"> -->
-    <div class="row one detail">
-      <p class="title">医院地址：</p>
-      <p class="msg">深圳市南山区学苑大道1001号南山智园A4栋9楼918</p>
+    <div class="row one detail" v-if="item.mode_type == 2">
+      <p class="title">{{item.title}}:</p>
+      <p class="msg">{{item.Hosaddress.address}}</p>
     </div>
-    <div class="row">
-      <p class="title">电&ensp;&ensp;&ensp;&ensp;话：</p>
-      <p class="msg">0755-8548683</p>
+    <div class="row" v-if="item.mode_type == 3">
+      <div v-for="it in Connectways" :key="it.id">
+        <p class="title">{{it.title}}:</p>
+        <p class="msg">{{it.content}}</p><br>
+       </div>
     </div>
-    <div class="row">
-      <p class="title">手机号码：</p>
-      <p class="msg">13612805443</p>
+    <div class="row" v-if="item.mode_type == 4">
+      <p class="title">{{item.title}}:</p>
+      <p class="msg">{{item.Worktime.worktime}}</p>
     </div>
-    <div class="row">
-      <p class="title">工作时间：</p>
-      <p class="msg">15:00-18:00</p>
+    <div class="row one" v-if="item.mode_type == 5">
+      <p class="title">{{item.title}}:</p>
+      <p class="msg">{{item.Rideway.ride_way}}</p>
     </div>
-    <div class="row one">
-      <p class="title">乘车方式：</p>
-      <p class="msg">乘1路或859路车至千峰路口站下车向南500米</p>
     </div>
-    <!-- </div> -->
-    <!-- 联系我们页面 -->
-    <!-- <div class="scroll"  style="padding:15px 4%;">
-              <div v-for="item in this.ordmodel" :key="item.id">
-                     <div v-if="item.mode_type == 1" class="contractmodeone">
-                        <mt-swipe :auto="4000" class="swipertwo">
-                             <mt-swipe-item  v-for="it in item.Conrotation" :key="it.id">
-                                    <img :src="it.images" style="width:100%;height:100%">
-                             </mt-swipe-item>
-                        </mt-swipe>
-                     </div>
-
-                     <div v-if="item.mode_type == 2" class="oldmodetwo">
-                          <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Hosaddress.address}}</span></div>
-                     </div>
-                     <div  v-if="item.mode_type == 3">
-                            <div class="oldmodeone" v-for="it in Connectways" :key="it.id">
-                                  <div class="oldmodefive">
-                                      <span>{{it.title}}:&nbsp;&nbsp;{{it.content}}</span>
-                                 </div>
-                             <div class="oldmodesix" @click="tallPhone(it.content)">
-                                  <img src="static/images/u318.png" style="width 100%;height:100%">
-                             </div>
-                            </div>
-                     </div>
-                      <div class="oldmodefour" v-if="item.mode_type == 4">
-                          <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Worktime.worktime}}</span></div>
-                          </div>
-                             <div class="oldmodethree" v-if="item.mode_type == 5">
-                               <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Rideway.ride_way}}</span></div>
-                             </div>
-                        </div>
-    </div>-->
   </div>
 </template>
 <script>
@@ -174,94 +135,4 @@ export default {
   margin: 1.1875rem 1.25rem 0 1.25rem;
 }
 
-// .modeone {
-//   width: 100%;
-//   height: 220px;
-//   margin-bottom: 10px;
-//   /* border:solid 1px red; */
-// }
-
-// .oldmodetwo {
-//   width: 300px;
-//   height: 100%;
-//   /* border: solid 1px red; */
-//   font-size: 14px;
-//   margin-bottom: 8px;
-//   font-size: 1rem;
-//   font-weight: 600;
-//   color: rgba(7, 18, 40, 1);
-//   line-height: 2.375rem;
-//   height: 2.375rem;
-// }
-
-// .oldmodeone {
-//   width: 318px;
-//   min-height: 22px;
-//   /* border: solid 1px red; */
-//   margin-bottom: 8px;
-//   font-size: 1rem;
-//   font-weight: 600;
-//   color: rgba(7, 18, 40, 1);
-//   line-height: 2.375rem;
-//   height: 2.375rem;
-// }
-
-// .oldmodesix {
-//   position: absolute;
-//   width: 50px;
-//   min-height: 20px;
-//   /* border: solid 1px blue; */
-//   margin-left: 200px;
-//   margin-top: -30px;
-//   //   font-size: 1rem;
-//   //  font-weight: 600;
-//   //  color: rgba(7, 18, 40, 1);
-//   //  line-height: 2.375rem;
-//   //  height: 2.375rem;
-// }
-
-// .oldmodefive {
-//   width: 250px;
-//   min-height: 20px;
-//   /* border: solid 1px red; */
-// }
-
-// .oldmodefour {
-//   width: 300px;
-//   height: 30px;
-//   color: black;
-//   /* border:solid 1px red; */
-//   margin-bottom: 8px;
-//   font-size: 1rem;
-//   font-weight: 600;
-//   color: rgba(7, 18, 40, 1);
-//   line-height: 2.375rem;
-//   height: 2.375rem;
-// }
-
-// .oldmodethree {
-//   width: 300px;
-//   height: 100%;
-//   color: black;
-//   /* border:solid 1px red; */
-//   margin-bottom: 8px;
-//   font-size: 1rem;
-//   font-weight: 600;
-//   color: rgba(7, 18, 40, 1);
-//   line-height: 2.375rem;
-//   height: 2.375rem;
-// }
-// .contractmodeone {
-//   //  width: 100%;
-//   //  height: 200px;
-//   width: 100%;
-//   height: 11.5625rem;
-//   //  border: solid 1px red
-// }
-// #wrappertwo {
-//   width: 40%;
-// }
-// #wrappert {
-//   width: 43%;
-// }
 </style>

src/scrm_pages/microHome/microHome.vue

@@ -51,7 +51,7 @@
               </div>
               <div class="detail">
                 <p class="detailTitle">{{it.title}}</p>
-                <p class="detailMessage">{{it.content}}</p>
+                <!-- <p class="detailMessage">{{it.content}}</p> -->
               </div>
             </div>
           </div>
@@ -194,8 +194,7 @@
           class="tabOne"
           v-for="item in this.navigationdata"
           :key="item.id"
-          @click="CallPhone(item.linktype,item.navaddress)"
-        >
+          @click="CallPhone(item.linktype,item.navaddress)">
           <img :src="item.navimages" alt />
           <span>{{item.navtitle}}</span>
         </li>
@@ -324,15 +323,21 @@ export default {
     },
     NavigationClick(title, address, orgid) {
       console.log("orgid", orgid);
-      if (title == "联系我们") {
-        this.$router.push({
+      //  debugger
+      if(title == "加入会员"){
+        window.location.href = "http://wx.kuyicloud.com/weixin/membershipagree/"+orgid;
+      }else if(title == "联系我们"){
+          this.$router.push({
           path: "/contact",
           query: {
             orgid: orgid
           }
-        });
+         });
+      }else if(title =="咨询客服"){
+         window.location.href = "http://wx.kuyicloud.com/weixin/im/"+orgid;
+      }else{
+        window.location.href = address;
       }
-      window.location.href = address;
     },
 
     CallPhone(linktype, address) {