Merge remote-tracking branch 'origin/master'

src/assets/fonts/iconfont.json

@@ -5,6 +5,139 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "4925645",
+      "name": "医疗",
+      "font_class": "medical-treatment",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "9143194",
+      "name": "退出",
+      "font_class": "tuichu1",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
+      "icon_id": "9665122",
+      "name": "退出",
+      "font_class": "tuichu2",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "691178",
+      "name": "电话",
+      "font_class": "dianhua2",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "1761498",
+      "name": "药",
+      "font_class": "yao",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "4799927",
+      "name": "定位",
+      "font_class": "dingwei1",
+      "unicode": "e79c",
+      "unicode_decimal": 59292
+    },
+    {
+      "icon_id": "12387158",
+      "name": "心",
+      "font_class": "xin1",
+      "unicode": "e910",
+      "unicode_decimal": 59664
+    },
+    {
+      "icon_id": "13479212",
+      "name": "切换",
+      "font_class": "B",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
+      "icon_id": "827984",
+      "name": "心",
+      "font_class": "xin",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "5152778",
+      "name": "电话",
+      "font_class": "dianhua1",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "10501992",
+      "name": "电话",
+      "font_class": "ziyuan1",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "17537341",
+      "name": "记录电话",
+      "font_class": "jiludianhua",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "765326",
+      "name": "问诊",
+      "font_class": "shouye3",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "1001740",
+      "name": "电话",
+      "font_class": "dianhua",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "1799760",
+      "name": "维修",
+      "font_class": "weixiu",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "5603490",
+      "name": "家政服务",
+      "font_class": "jiazhengfuwu",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "6204757",
+      "name": "日期",
+      "font_class": "riqi",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "6560991",
+      "name": "理疗",
+      "font_class": "liliao",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "10527597",
+      "name": "点餐",
+      "font_class": "diancan",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
     {
       "icon_id": "716041",
       "name": "消息",

src/components/ShareServer.vue

@@ -83,12 +83,15 @@
 
 			//微信分享自定义
 			wxShare() {
-
 				console.log(this.nowItem);
 				if(this.shareName){
                     this.nowItem.shareTitle=this.shareName;
                 }
 				let joinUrl = window.location.href
+
+                if(joinUrl.indexOf("&share=1")>0){
+                    joinUrl= joinUrl.replace("&share=1","")
+                }
 				var _this = this;
 				wx.ready(function() {
 					wx.onMenuShareAppMessage({

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

@@ -180,8 +180,10 @@
 							_this.isLoading = true;
 							API_From.add(_this.detail).then(response => {
 								_this.$router.push({
-									name: 'GuestFromList',
+									name: 'GuestToInfo',
 									query: {
+										id: response.id,
+										share:'1'
 									}
 								})
 

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

@@ -92,7 +92,8 @@
 				 this.$router.push({
 					name: name,
 					query: {
-						id: mod.id
+						id: mod.id,
+						share:'1'
 					}
 				})
 			},

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

@@ -2,6 +2,7 @@
   <div>
     <header class="mui-bar mui-bar-nav" v-if="step=='1'" >
       <h1 class="mui-title">访问邀请函</h1>
+      <a v-if="toList" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
     </header>
     <share-server ref="shareServer" :id="1"  ></share-server>
 
@@ -213,7 +214,16 @@
              @cropperFinish="cropperFinish" @cropperCancel="cropperCancel"></cropper>
     <loading :visible="isLoading"></loading>
     <input type="file" ref="myFile"  style="display: none" class="mui-btn mui-btn-block mui-navigate-right" accept="image/*" @change="uploadPicture($event)"/>
+    <loading :visible="isLoading"></loading>
 
+    <div>
+      <div :class="visible?'mui-loading z-loading2':'mui-loading'">
+        <div v-show="visible" style="　text-align:center;">
+          <img src="~$project/assets/img/guide_point.png" style="width: 100%;" />
+          <button type="submit" class="mui-btn mui-btn-blue" @click="back()">返回列表</button>
+        </div>
+      </div>
+    </div>
 
   </div>
 </template>
@@ -250,6 +260,7 @@
     },
     data() {
       return {
+        toList:null,
         pageTitle: '访问邀请函',
         id: '',
         step:'1',
@@ -267,6 +278,7 @@
           photo:''
         },
         isLoading: false,
+        visible: false,
         qrCodeImg: '',
         //隐藏裁剪图片
         cropperCancel() {
@@ -295,9 +307,23 @@
     },
     created() {
       this.id = this.$route.query.id;
+
+      //直接访问本页面 ，直接添加  ，通过list 进来， 需要有返回， 有分享提示
+      this.toList = this.$route.query.share;
+      //
+      if(this.toList){
+        this.visible=true;
+      }
       this.subForm.id=this.id;
     },
     methods:  {
+      back(){
+        this.$router.push({
+          name: 'GuestFromList',
+          query: {
+          }
+        })
+      },
       valert(){
         mui.alert("该照片仅用于访客在访问期间，快速识别人脸进入时使用，访问结束后自动清除数据。",'   ',['知道了'])
       },
@@ -466,5 +492,20 @@
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 
-<style>
+<style scoped>
+  .z-loading2 {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background:  rgba(16, 14, 14, 0.9);
+    z-index: 999;
+  }
+
+  .z-loading2 div {
+    top: 0%;
+    position: absolute;
+    left: 0%
+  }
 </style>