Merge remote-tracking branch 'origin/master'

src/components/ShareServer.vue

@@ -2,7 +2,7 @@
 </template>
 
 <script>
-    import * as API_Common from '$project/utils/common'
+    import * as API_Common from '$project/apis/common'
 
     import wx from 'weixin-js-sdk'
     import * as WxJsApi from '$project/utils/wxJsApi'
@@ -32,7 +32,9 @@
 				}
 			}
 		},
-		created() {},
+		created() {
+
+        },
 		methods: {
 			//父组件调用子组件的方法在获取相应的数据后调用
 			init() {
@@ -48,12 +50,15 @@
 
 			//第二种方法，直接通过调用该方法来处理
 			setShare() {
+                //定义微信分享
+                this.wxShare();
+                    return
+
 				this.isLoading = true;
 				API_Common.getSchoolServeList().then(response => {
 					this.isLoading = false;
 
-					var serverList = ['0']; //这里要默认一个0
-					for (var i = 0; i < response.length; i++) {
+ 					for (var i = 0; i < response.length; i++) {
 						if (response[i]['dictionaryId'] == this.id) {
 							this.nowItem = response[i];
 							break;
@@ -65,7 +70,7 @@
 
 				}).catch(error => {
 					this.isLoading = false;
-					this.mui.toast(error);
+					//this.mui.toast(error);
 				})
 			},
 
@@ -120,6 +125,7 @@
 		},
 		mounted() {
             WxJsApi.getWxConfig();
+
 		},
 	}
 </script>

src/projects/business/views/Guest/From/Add.vue

@@ -53,7 +53,7 @@
 			</div>
 		</div>
 		<div class="fyy-footer"  v-if="step=='1'">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="submit()">发送短信邀请函</button></div>
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="submit()">创建邀请函</button></div>
 		</div>
 	<header class="mui-bar mui-bar-nav "  v-if="step=='2'"  >
 		<a  class="mui-title">{{pageTitle}}</a>

src/projects/business/views/Guest/From/List.vue

@@ -3,28 +3,33 @@
 	<common @asynCallBack="asynCallBack"></common>
 	<top-header :pageTitle="pageTitle"  :routeName="routeName" ></top-header>
 		<div class="mui-content margin60">
+			<template v-for="item in recordList">
+				<div class="mui-content-padded" >
+
+					<ul class="mui-table-view fyy-view" @click="detail(item)">
+						<li class="mui-table-view-cell" >
+							<label>受  邀 人：</label>
+							<span>{{item.name}}<span class="mui-pull-right " :class="statusColor[item.status]">{{status[item.status]}}</span></span>
+						</li>
+						<li class="mui-table-view-cell"  >
+							<label>受邀单位：</label>
+							<span>{{item.unit}}</span>
+						</li>
+						<li class="mui-table-view-cell"  >
+							<label>拜访事宜：</label>
+							<span>{{item.visitReasons}}</span>
+						</li>
+						<li class="mui-table-view-cell"  >
+							<label>拜访时间：</label>
+							<span>{{item.visitDate}}</span>
+						</li>
+
+					</ul>
+
+				</div>
+
+			</template>
 
-			<div class="mui-content-padded" v-for="item in recordList">
-
-				<ul class="mui-table-view fyy-view" @click="detail(item.id)">
-					<li class="mui-table-view-cell">
-						<label>受  邀 人：</label>
-						<span>{{item.name}}<span class="mui-pull-right " :class="statusColor[item.status]">{{status[item.status]}}</span></span>
-					</li>
-					<li class="mui-table-view-cell">
-						<label>受邀单位：</label>
-						<span>{{item.unit}}</span>
-					</li>
-					<li class="mui-table-view-cell">
-						<label>拜访事宜：</label>
-						<span>{{item.visitReasons}}</span>
-					</li>
-					<li class="mui-table-view-cell">
-						<label>拜访时间：</label>
-						<span>{{item.visitDate}}</span>
-					</li>
-				</ul>
-			</div>
 
 		</div>
 		<div class="fyy-footer">
@@ -81,12 +86,13 @@
 		},
 		methods: {
 			//info
-			detail(id) {
 
+			detail(mod) {
+				var name=mod.status==0?'GuestToInfo':"GuestFromInfo"
 				 this.$router.push({
-					name: 'GuestFromInfo',
+					name: name,
 					query: {
-						id: id
+						id: mod.id
 					}
 				})
 			},

src/projects/business/views/Guest/To/Info.vue

@@ -3,6 +3,7 @@
     <header class="mui-bar mui-bar-nav" v-if="step=='1'" >
       <h1 class="mui-title">访问邀请函</h1>
     </header>
+    <share-server ref="shareServer" ></share-server>
 
     <div   v-if="step=='1'" class="mui-content margin60">
       <div class="mui-content-padded vongi-qingjiadt">
@@ -225,6 +226,7 @@
   import TopHeader from '$project/components/TopHeader.vue'
   import QRCode from 'qrcodejs2'
   import Cropper from '$project/components/Cropper.vue'
+  import ShareServer from '$project/components/ShareServer.vue'
 
   import {
     mapGetters,
@@ -242,7 +244,9 @@
     components: {
       Common,
       Loading,
-      TopHeader,	Cropper
+      TopHeader,
+      Cropper,
+      ShareServer
     },
     data() {
       return {
@@ -444,7 +448,7 @@
     },
     mounted() {
       //获取微信配置
-
+      this.$refs.shareServer.setShare();
       this.getDetail();
 
     },