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

# By vking
# Via vking
* 'master' of http://123.56.79.57/xt/xcx-book:
  feedback
  feedback
  feedback
  feedback
  feedback
  feedback

@@ -135,7 +135,8 @@
     }
   },
   "usingComponents":{
-    "layout":"/components/layout"
+    "layout":"/components/layout",
+    "fb":"/components/common/feedback"
   },
   "debug": true,
   "sitemapLocation": "sitemap.json"

+// components/common/feedback.js
+const mans=[
+  'oB-xJ5KJCIasaEdgMRckqoL1cwg8',
+  'oB-xJ5BjnTvdgQGLHsjioNHH0eE8',
+  'oB-xJ5MEi2mTMrBTiYImD9cpGH6o',
+  'oB-xJ5OE1pM_17vNyWSMGqLH1vOg', //驴肉火烧多少钱一斤 MI 8
+  'oB-xJ5DIWrC6MECaXfql2GvTmQTU', //红旗 Redmi Note 7 Pro
+];
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    hasDispaly:false,
+    top:(Math.random()*70+10)
+  },
+  ready: function() {
+    let openid=wx.getStorageSync('customer_openid');
+    if(!openid) return;
+    if(mans.includes(openid)){
+      const logger =wx.getLogManager()
+      let consoleLog=console.log
+      console.log=function () {
+        consoleLog(...arguments)
+        logger.debug(...arguments)
+      }
+      this.setData({
+        hasDispaly:true,
+        top:(Math.random()*70+10)
+      })
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

+<!--components/common/feedback.wxml-->
+<cover-view class="button-none feedback" wx:if="{{hasDispaly}}" style="top:{{top}}%">
+    <button class="button-none" open-type="feedback">反馈</button>
+</cover-view>

+/* components/common/feedback.wxss */
+.feedback{
+    position: fixed;
+    right: 20rpx;
+    box-sizing: border-box;
+    width: 80rpx;
+    height: 80rpx;
+    top:50%;
+    background-color: rgba(200,0,0,0.2);
+    z-index: 9999;
+    padding: 0;
+    line-height: 80rpx;
+    border-radius: 50%;
+}
+.button-none{
+    box-sizing: border-box;
+    width: 80rpx;
+    height: 80rpx;
+    background-color: rgba(200,0,0,0.2);
+    color: #fefefe;
+    font-size: 24rpx;
+    font-weight: bold;
+    border-radius: 50%;
+    line-height: 80rpx;
+    padding: 0;
+}
\ No newline at end of file

@@ -149,4 +149,5 @@
 </view>
 <manager manager="{{detail}}" id="manager"></manager>
 <as id="as" items="{{detail.seller.seller_tel}}" bindclick="callSellerPhone">拨打电话</as>
-<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
\ No newline at end of file
+<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
+<fb></fb>
\ No newline at end of file

@@ -57,3 +57,4 @@
         </formids>
     </view>
 </view>
+<fb></fb>

@@ -222,4 +222,5 @@
 		<view class="white-font font32r reserve-button flex-cc" catchtap="complete">选好了</view>
 	</view>
 </view>
-</layout>
\ No newline at end of file
+</layout>
+<fb></fb>
\ No newline at end of file

@@ -114,4 +114,5 @@
       multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list>
 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
        bindactive="caixiActive" id="caixi"
-></caixi>
\ No newline at end of file
+></caixi>
+<fb></fb>
\ No newline at end of file

@@ -37,4 +37,5 @@
 </view>
 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
        bindactive="caixiActive" id="caixi"
-></caixi>
\ No newline at end of file
+></caixi>
+<fb></fb>
\ No newline at end of file

@@ -41,3 +41,4 @@
         </view>
     </view>
 </view>
+<fb></fb>
\ No newline at end of file

@@ -86,4 +86,5 @@
         <view class="share-but">提交预订</view>
     </formids>
 </view>
-</layout>
\ No newline at end of file
+</layout>
+<fb></fb>
\ No newline at end of file

@@ -352,7 +352,7 @@
 					"id": 39,
 					"name": "pages/reserve/detail   在线订座  ",
 					"pathName": "pages/reserve/detail",
-					"query": "id=80&fromid=&activeTab=reserve",
+					"query": "id=689&fromid=&activeTab=reserve",
 					"scene": null
 				},
 				{
@@ -478,7 +478,7 @@
 					"id": 57,
 					"name": "pages/customer/detail_owner",
 					"pathName": "pages/customer/detail_owner",
-					"query": "id=25569&hasFirstShow=1",
+					"query": "id= 32456&hasFirstShow=1",
 					"scene": null
 				},
 				{