Merge branch 'master' of http://123.56.79.57/xt/xcx-book

@@ -13,6 +13,7 @@ Page({
   data: {
   data: {
     list:[],
     list:[],
     hasMore:true,
     hasMore:true,
+    hasSalesman:false,
   },
   },
 
 
   /**
   /**
@@ -21,6 +22,11 @@ Page({
   enter_params: {},
   enter_params: {},
   onLoad: function (options) {
   onLoad: function (options) {
     this.enter_params = util.cache('enter_params');
     this.enter_params = util.cache('enter_params');
+    App.Reserve.SellerInfo(this.enter_params).then(res=>{
+      this.setData({
+        hasSalesman:res.data.hasSalesman==1
+      })
+    })
     this.seller_id=options.seller_id||this.enter_params.seller_id;
     this.seller_id=options.seller_id||this.enter_params.seller_id;
     this.getMembers();
     this.getMembers();
   },
   },
@@ -80,4 +86,15 @@ Page({
       this.setData(obj)
       this.setData(obj)
     })
     })
   },
   },
+  sendSalesmanMsg(e){
+    let openid=util.attr(e,'openid')
+    App.Reserve.SendSalesmanMsg({
+      openid:openid
+    }).then(res=>{
+      if(res.ret!=200){
+        return util.toast(res.msg,'none')
+      }
+      util.toast('已发送')
+    })
+  },
 })
 })

@@ -9,8 +9,9 @@
                 </view>
                 </view>
                 <view class="nickname">{{item.nickname||''}}</view>
                 <view class="nickname">{{item.nickname||''}}</view>
             </view>
             </view>
-            <view class="flex-rr">
-                <!--view class="more"></view-->
+            <view class="flex-rr optmsg" wx:if="{{hasSalesman}}" bindtap="sendSalesmanMsg">
+                <view>发送消息</view>
+                <view class="more"></view>
             </view>
             </view>
         </view>
         </view>
     </block>
     </block>

@@ -48,4 +48,8 @@ http://qn.colorcun.com/custom/lite-yd/image/icon-cz.png
 .nickname{
 .nickname{
   margin-left: 40rpx;
   margin-left: 40rpx;
   font-size: 34rpx;
   font-size: 34rpx;
+}
+.optmsg{
+  font-size: 30rpx;
+  color:#199095;
 }
 }

@@ -155,5 +155,11 @@ export default {
 	'App.User.GetCustomRemark':null,
 	'App.User.GetCustomRemark':null,
 	
 	
 	//添加备注
 	//添加备注
-	'App.User.AddCustomRemark':null
+	'App.User.AddCustomRemark':null,
+
+  //运营发送消息demo
+  'App.Reserve.SendSalesmanMsg':{
+    silence: false,
+    alias:'App.Reserve.SendSalesmanMsg',
+  },
 }
 }