manager-invitation

@@ -25,9 +25,10 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    let openid=getApp().openid;
-    if(options.fromid==openid && options.hasSellerShare==1){//商家分享自己点跳到商家预览页
+  openid:'',
+  onLoad: async function (options) {
+    this.openid=await getApp().openid;
+    if(options.fromid==this.openid && options.hasSellerShare==1){//商家分享自己点跳到商家预览页
       wx.redirectTo({
         url:util.http_build_query({rid:options.rid,tplid:options.tplid},'./review')
       })
@@ -36,7 +37,7 @@ Page({
     App.Invitation.SetInvitationRel({
       id:options.rid,
       initiator:options.fromid,
-      inviting:openid,
+      inviting:this.openid,
     })
     let param={
       options:options,
@@ -46,15 +47,15 @@ Page({
       param.tpls=[TP.tpls(options.tplid)]
     }
     this.setData(param)
-    this.initData(options,openid);
+    this.initData(options);
   },
-  initData(options,openid){
+  initData(options){
     App.Invitation.Detail({id:options.rid}).then(res=>{
       let hasOwner=false;
       let hasCanSuccess=false;
       if(res.data.customers && res.data.customers.length>0){
         res.data.customers.forEach((u,i)=>{
-          if(u.openid==openid){
+          if(u.openid==this.openid){
             if(i==0){hasOwner=true;}
             hasCanSuccess=true;
           }
@@ -142,14 +143,14 @@ Page({
   onShareAppMessage: function () {
     let path=util.http_build_query({
       ...this.data.options,
-      fromid:getApp().openid,
+      fromid:this.openid,
       hasSellerShare:'',
     },'/pages/manager-invitation/display')
     return {
       title: '你收到一个邀请函，点击查看',
       path: path,
-      //imageUrl:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-anpai2.jpg',
-      imageUrl:util.cgi('App.Reserve.MakePic&rid='+this.data.options.rid),
+      imageUrl:this.data.tpls[this.data.current].shareImage,
+      //imageUrl:util.cgi('App.Reserve.MakePic&rid='+this.data.options.rid),
     }
   },
   setUserInfoSuccess(){
@@ -158,10 +159,9 @@ Page({
   confirmed(){
     if(!this.data.seller.hasCanSuccess){
       let userInfo=util.cache('userInfo');
-      let openid=getApp().openid
       if(userInfo){
         userInfo=JSON.stringify({
-          openid: openid,
+          openid: this.openid,
           avatar: userInfo.avatarUrl,
           nickname: userInfo.nickName,
           gender: userInfo.gender
@@ -169,7 +169,7 @@ Page({
       }
       App.Invitation.SetInvitationConfirm({
         lid:this.data.options.rid,
-        openid:openid,
+        openid:this.openid,
         is_agree:1,
         userinfo:userInfo
       }).then(res=>{

@@ -80,6 +80,8 @@ Page({
               sid:sel.id,
               name:sel.name,
               addr:sel.address,
+              latitude:sel.lat,
+              longitude:sel.long,
             }
           })
         }
@@ -147,6 +149,15 @@ Page({
   checkHasSubmit(){
     let form=this.data.form;
     let flag=false;
+    console.log(
+      form.name
+      , (this.data.pickerValue[0]>-1 || form.time>0)
+      , form.room
+      , form.addr
+      , form.latitude>0
+      , (!this.tpl.hasImage || (this.tpl.hasImage && form.image))
+
+    )
     if(
       form.name
       && (this.data.pickerValue[0]>-1 || form.time>0)
@@ -192,7 +203,13 @@ Page({
   },
   submit(){
     if(!this.checkHasSubmit()){
-      return util.toast('请等待图片上传完成','none')
+      let msg='请完善邀请函信息';
+      if(this.data.form.latitude<1){
+        msg='请标注店铺位置'
+      }else if(!this.data.form.image){
+        msg='请等待图片上传完成'
+      }
+      return util.toast(msg,'none')
     }
     let opt=this.data.options
     let param={

@@ -144,13 +144,13 @@ Page({
       return {
         title: '一键订，客户经理专用的拓客工具',
         path: '/pages/manager-invitation/index',
-        imageUrl:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-anpai2.jpg',
+        imageUrl:this.data.tpls[this.data.current].shareFirstImage,
       }
     }
     return {
       title: '点击查看详情，发邀请函',
       path: path,
-      imageUrl:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-anpai2.jpg',
+      imageUrl:this.data.tpls[this.data.current].shareFirstImage,
     }
   },
   swiperChange(e){

@@ -31,7 +31,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 43,
+			"current": 44,
 			"list": [
 				{
 					"id": 0,
@@ -361,14 +361,14 @@
 					"id": 43,
 					"name": "pages/manager-invitation/review",
 					"pathName": "pages/manager-invitation/review",
-					"query": "rid=5&tplid=1",
+					"query": "",
 					"scene": null
 				},
 				{
 					"id": 44,
 					"name": "pages/manager-invitation/editor",
 					"pathName": "pages/manager-invitation/editor",
-					"query": "tplid=2&rid=",
+					"query": "tplid=1&rid=",
 					"scene": null
 				},
 				{

@@ -6,6 +6,8 @@ let tpls=[
     name: '商务',
     hasImage:false,
     timeStr:'YYYY/MM/DD 星期WW HH:II',
+    shareFirstImage:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-anpai2.jpg',
+    shareImage:'http://qn.colorcun.com/custom/lite-yd-cook/imageshare-qing.jpg',
   },
   {
     id: 2,
@@ -13,6 +15,8 @@ let tpls=[
     name: '温馨',
     hasImage:true,
     timeStr:'YYYY年MM月DD日HH时II分',
+    shareFirstImage:'http://qn.colorcun.com/manager-invitation/wx/share-wx-1.jpg',
+    shareImage:'http://qn.colorcun.com/manager-invitation/wx/share-wx.jpg',
   },
 ];
 module.exports ={