Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian

# Conflicts:
#	pages/homeblock/zhinengselect/zhinengselect.wxml
#	pages/homeblock/zhinengselect/zhinengselect.wxss
#	pages/myblock/jiudan/jiudan.js
#	pages/myblock/jiudan/jiudan.json
#	pages/myblock/jiudan/jiudan.wxml
#	pages/myblock/jiudan/jiudan.wxss
#	pages/myblock/xiugaimima/xiugaimima.js
#	pages/myblock/xiugaimima/xiugaimima.json
#	pages/myblock/xiugaimima/xiugaimima.wxml
#	pages/myblock/xiugaimima/xiugaimima.wxss
#	pages/myblock/yonghufankui/yonghufankui.js
#	pages/myblock/yonghufankui/yonghufankui.json
#	pages/myblock/yonghufankui/yonghufankui.wxml
#	pages/myblock/yonghufankui/yonghufankui.wxss
#	pages/yonghuxieyi/yonghuxieyi.js
#	pages/yonghuxieyi/yonghuxieyi.json
#	pages/yonghuxieyi/yonghuxieyi.wxml
#	pages/yonghuxieyi/yonghuxieyi.wxss

@@ -713,7 +713,6 @@ Page({
     for (var i = 0; i < newnavarr.length; i++) {
       if (i == index) {
         newnavarr[i].sel = !newnavarr[i].sel;
-
         if (type == 4) {
           if (newnavarr[i].sel == true) {
             console.log(999)
@@ -732,8 +731,6 @@ Page({
               pricechose: false,
               morechose: false,
               fenchose: false
-
-
             })
           }
         }else if(type==2){
@@ -813,9 +810,6 @@ Page({
         newnavarr[i].sel = false
       }
     }
-
-
-
     this.setData({
       navarr: newnavarr
     })
@@ -857,19 +851,25 @@ Page({
       console.log(that.data.selectinfo)
 
       let middlevalue = '';
-
-
+      let during = that.data.selectinfo.price[0].number;
+      let max = parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number);
+      let duan = parseInt(max/during);
+      let per_val = (during/max*100).toFixed(2);
+      let tempData = [];
+      for(let i = 1; i<=duan ; i++){
+        tempData.push(i)
+      }
 
       that.setData({
-
         leftMin: parseInt(that.data.selectinfo.price[0].realmin),
         rightMax: parseInt(that.data.selectinfo.price[0].realmax),
-
         min: parseInt(that.data.selectinfo.price[0].min) - parseInt(that.data.selectinfo.price[0].number),
         max: parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number),
         priceyuan: that.data.selectinfo.price[0].realmin + '元' + '-' + that.data.selectinfo.price[0].realmax + '元',
         pricevalue: that.data.selectinfo.price[0].realmin + '-' + that.data.selectinfo.price[0].realmax,
-        number: that.data.selectinfo.price[0].number
+        number: that.data.selectinfo.price[0].number,
+        during: tempData,
+        per_val:per_val
       })
       console.log(909080807070)
 

@@ -26,18 +26,17 @@
 <!-- 价格 -->
 <view class="register" wx:if="{{pricechose}}" bindtap="hideprice" catchtouchmove='true'>
   <view class="pregisterwrap">
-
     <view class="pyuan">{{priceyuan}}</view>
-
     <view class="zy-slider" catchtap='pingbi'>
       <zy-slider id="zy-slider1" minValue="{{leftMin}}" maxValue="{{rightMax}}" min="{{min}}" max="{{max}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="lowValueChangeAction" bind:heighValueChange="heighValueChangeAction"
       />
 <!-- style="left:{{ppleft}}rpx; width:{{ppvalue-ppleft}}rpx" -->
-      <!-- <view class="pp" style="width:67%;background:red;height:10rpx;margin:50rpx auto 0">
-        <view class="ppitem"></view>
-        <view class="ppitem"></view>
-        <view class="ppitem"></view>
-        <view class="ppitem"></view>
+      <view class="pp" style="height:10rpx;margin:50rpx 0 0 5px">
+      <block wx:for='{{during}}' wx:key=''>
+        <view style="width: {{per_val}}%" class="single_item">
+          <view class="detail_num">{{item*number}}</view>
+        </view>
+      </block>
       </view> -->
     </view>
   </view>
@@ -47,12 +46,10 @@
 <view class="register" wx:if="{{fenchose}}" bindtap="hidefen" catchtouchmove='true'>
   <view class="pregisterwrap">
     <view class="pyuan">{{score}}</view>
-
     <view class="zy-slider">
       <zy-slider id="zy-slider1" minValue="{{fenleftMin}}" maxValue="{{fenrightMax}}" min="{{fenmin}}" max="{{fenmax}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="fenlowValueChangeAction" bind:heighValueChange="fenheighValueChangeAction"
       />
     </view>
-
   </view>
 </view>
 
@@ -90,12 +87,7 @@
             data-basic_sort="{{item.basic_sort}}" bind:heighValueChange="heighValueChangeAction1" data-parindex="{{par}}" />
         </view>
       </view>
-
     </view>
-
-
-
-
   </view>
 </view>
 <view class="shaisel">
@@ -118,8 +110,6 @@
   <view class="nodataimg" wx:if="{{zhinenglist.length==0}}">
     <image src="/img/wushuju.png"></image>
   </view>
-
-
   <block wx:else>
     <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="" bindtap="jumpbrand" data-id="{{item.id}}">
       <view class="searchitemleft">
@@ -139,9 +129,6 @@
       </view>
 
       <view class="starimg" bindtap="collect" data-id="{{item.id}}">
-
-
-
         <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
         <image src="{{url}}aicon_09x.png" wx:else></image>
       </view>

@@ -323,5 +323,36 @@ page {
 .ppitem{
   width:1px;
   height:50rpx;
-  background: green; 
+  background: green;
+}
+.single_item{
+  height: 2px;
+  background: #f5f5f5;
+  position: relative;
+}
+.single_item::after{
+  content:'';
+  height: 8px;
+  width: 2px;
+  background-color: #ccc;
+  right: 0;
+  position: absolute;
+  bottom: 0;
+}
+.single_item:last-child{
+  opacity: 0
+}
+.single_item:first-child{
+  background: #FFF;
+}
+.single_item:last-child::after{
+  height: 0;
+}
+.detail_num{
+  color: #999;
+  font-size: 24rpx;
+  position: absolute;
+  top: -25px;
+  right: 0;
+  transform: translateX(50%);
 }
\ No newline at end of file

 {
-  "navigationBarTitleText": "名人酒单"
+  "navigationBarTitleText": "˾Ƶ"
 }
\ No newline at end of file

@@ -2,7 +2,7 @@
 <view class="nodataimg" wx:if="{{peoplelist.length==0}}">
   <image src="/img/wushuju.png"></image>
 </view>
-<!-- <view class="noData" wx:if="{{peoplelist.length==0}}">暂无相关数据</view> -->
+<!-- <view class="noData" wx:if="{{peoplelist.length==0}}">暂无相关数据</view> -->
 <view class='wine_list' wx:else>
   <view class='list_item' wx:for="{{peoplelist}}" wx:key="" bindtap="detail" data-id="{{item.id}}">
     <view class='img_box'>
@@ -28,10 +28,10 @@
       <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
         <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
         <view class='min_action_box'>
-          <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
-          <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
+          <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
+          <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
 
-          <view class='action_btn'>分享</view>
+          <view class='action_btn'>分享</view>
            <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}"   ></button>
         </view> 
       </view>

 {
-  "navigationBarTitleText": "修改密码"
+  "navigationBarTitleText": "޸"
 }
\ No newline at end of file

 <view class="setmima">
   <view class="setmimaleft">
-  <input password  placeholder='原密码'  bindinput='inputold'  />
+  <input password  placeholder='原密码'  bindinput='inputold'  />
   </view>
   <view class="mimaeye">
       <image src="{{url}}/bicon_14x.png"></image>
@@ -8,7 +8,7 @@
 </view>
 <view class="setmima">
   <view class="setmimaleft">
-  <input password  placeholder='新密码'  bindinput='inputnew'  />
+  <input password  placeholder='新密码'  bindinput='inputnew'  />
   </view>
   <view class="mimaeye">
       <image src="{{url}}/bicon_14x.png"></image>
@@ -16,12 +16,12 @@
 </view>
 <view class="setmima">
   <view class="setmimaleft">
-  <input password  placeholder='确定新密码'  bindinput='inputnewque'  />
+  <input password  placeholder='确定新密码'  bindinput='inputnewque'  />
   </view>
   <view class="mimaeye">
       <image src="{{url}}/bicon_14x.png"></image>
   </view>
 </view>
-<view class="que" bindtap='confirmPassWord' wx:if="{{passqueding}}">确认</view>
-<view class="queren" wx:else>确认</view>
-<view class="needmi">需要有6-20位数字、字母或符号组成</view>
+<view class="que" bindtap='confirmPassWord' wx:if="{{passqueding}}">确认</view>
+<view class="queren" wx:else>确认</view>
+<view class="needmi">需要有6-20位数字、字母或符号组成</view>

 {
-  "navigationBarTitleText": "用户反馈"
+  "navigationBarTitleText": "û"
 }
\ No newline at end of file

 <view class="fankuicontent">
-  <textarea placeholder='请输入您的意见，我们会积极处理并改正的~' placeholder-class='enterclass' bindinput="enteryijian" />
+  <textarea placeholder='请输入您的意见，我们会积极处理并改正的~' placeholder-class='enterclass' bindinput="enteryijian" />
 
   <view class="wordlen">{{contentlen}}/200</view>
 </view>
 
 
 
-<view class="tijiao" bindtap="tijiao" wx:if="{{istijiao}}">提交</view>
-<view class="tijiao" wx:else>提交</view>
\ No newline at end of file
+<view class="tijiao" bindtap="tijiao" wx:if="{{istijiao}}">提交</view>
+<view class="tijiao" wx:else>提交</view>
\ No newline at end of file

@@ -4,15 +4,15 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
+		"coverView": true,
 		"autoAudits": false,
 		"uglifyFileName": true,
 		"checkInvalidKey": true,
-		"coverView": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
 		"babelSetting": {
@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 47,
+			"current": 48,
 			"list": [
 				{
 					"id": -1,
@@ -384,6 +384,14 @@
 					"id": -1,
 					"name": "用户协议",
 					"pathName": "pages/yonghuxieyi/yonghuxieyi",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/homeblock/zhinengselect/zhinengselect",
+					"pathName": "pages/homeblock/zhinengselect/zhinengselect",
+					"query": "",
 					"scene": null
 				}
 			]