模式切换

@@ -9,7 +9,7 @@
     <formids class="item flex-vc" bindtap="redirectTo" data-url="/pages/book/b_index">
         <view class="flex-vc {{pi==1?'checked':''}}">
             <view class="icon book"></view>
-            <view class="text">预定本</view>
+            <view class="text">已预订</view>
         </view>
     </formids>
     <formids class="item flex-vc" bindtap="redirectTo" data-url="/pages/book/b_setting">

@@ -16,5 +16,13 @@
             </view>
         </view>
     </formids>
+    <formids url="/pages/customer/index?islove=customer">
+        <view class="row flex-lr">
+            <view>切换到顾客模式</view>
+            <view class="flex-rr">
+                <view class="more"></view>
+            </view>
+        </view>
+    </formids>
 </view>
 <tabBar></tabBar>

@@ -12,6 +12,8 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
+    islove:'',//用户在哪端
+    enter_params:'',//商户入口参数
     async onLoad(opt) {
         console.log('onLoad', opt);
         //转化场景值到opt
@@ -31,10 +33,16 @@ Page({
             this.selectComponent("#network").refresh();
             return;
         }
-        //进行商户判断
-        let flag=await this.SellerForOpenid(opt.openid);
-        if(flag) return;
+        if(opt.islove){
+          util.cache('islove',opt.islove);
+          this.islove=opt.islove
+        }else{
+          this.islove=await util.cache('islove')
+        }
 
+        //获得商户数据
+        this.enter_params=await this.SellerForOpenid(opt.openid);
+        //console.log('this.enter_params',this.enter_params)
         let url = '/pages/customer/list';
         if (opt.id > 0 || opt.sms_code) {
             if(opt.invite_name){
@@ -55,20 +63,28 @@ Page({
             }
 
             App.Reserve.Detail(param).then(res => {
-                //设置关系
-                App.Reserve.SetRelaOpenid({
+                console.log(this.enter_params.seller_openid)
+                if(this.enter_params){//商户
+                    if(res.data.sid==this.enter_params.seller_id && !opt.fromid){//不是客户端分享，且是同一个店的
+                      util.cache('enter_params',this.enter_params)
+                      url = '/pages/book/b_detail';
+                    }
+                }
+                if(url!='/pages/book/b_detail'){
+                  //设置关系
+                  App.Reserve.SetRelaOpenid({
                     rid:res.data.id,
                     openid:opt.openid,
                     fromid:opt.fromid?opt.fromid:''
-                })
-
-                if (!res.data.openid) {//无预订人
+                  })
+                  if (!res.data.openid) {//无预订人
                     url = '/pages/customer/detail_owner';
-                } else {
+                  } else {
                     url = '/pages/customer/detail_customer';
                     if (res.data.openid == opt.openid) {
-                        url = '/pages/customer/detail_owner';
+                      url = '/pages/customer/detail_owner';
                     }
+                  }
                 }
                 url+='?id='+res.data.id
                 console.log('wx.redirectTo',url,res);
@@ -77,8 +93,15 @@ Page({
                 this.redirectTo({url: url});
             })
         } else {
-            console.log('url',url);
-            this.redirectTo({url: url});
+          if(this.enter_params && this.islove!='customer'){
+            //商户且未手动切换到顾客端
+            wx.reLaunch({
+                url:util.http_build_query(this.enter_params,'/pages/book/b_index')
+            })
+            return;
+          }
+          console.log('url',url);
+          this.redirectTo({url: url});
         }
 
     },
@@ -149,12 +172,15 @@ Page({
         enter_params=res.data;
       }
       if(enter_params) {
-        console.log('seller_enter_params', enter_params)
-        wx.reLaunch({
-          url:util.http_build_query(enter_params,'/pages/book/b_index')
-        })
-        return true
+          return enter_params;
       }
+      // if(enter_params) {
+      //   console.log('seller_enter_params', enter_params)
+      //   wx.reLaunch({
+      //     url:util.http_build_query(enter_params,'/pages/book/b_index')
+      //   })
+      //   return true
+      // }
       return false
     }
 })
\ No newline at end of file

 // pages/me/index.js
+import App from '../../utils/api';
+import util from '../../utils/util'
+const {regeneratorRuntime} = global
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    hasSellerBook:false,
   },
-
+  enter_params:'',
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    App.Reserve.SellerForOpenid({openid:getApp().openid}).then(res=>{
+      this.enter_params=res.data;
+      this.setData({
+        hasSellerBook:res.data,
+      })
+    })
   },
 
   /**
@@ -43,24 +51,10 @@ Page({
 
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+  gotoSellerBook(){
+    util.cache('islove','book');
+    wx.reLaunch({
+      url:util.http_build_query(this.enter_params,'/pages/book/b_index')
+    })
   }
 })
\ No newline at end of file

@@ -31,5 +31,13 @@
                 </view>
             </view>
         </formids>
+        <formids bindclick="gotoSellerBook" wx:if="{{hasSellerBook}}">
+            <view class="item flex-lr">
+                <view class="left">切换到商户模式</view>
+                <view class="right">
+                    <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image>
+                </view>
+            </view>
+        </formids>
     </view>
 </view>

@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 15,
+			"current": 6,
 			"list": [
 				{
 					"id": 0,