miniprogram / winebook · 提交

转到一个项目

作者 lihongjuan
提交 1d4ba26fda8eae6353dc510bb1529b0f08bf0ff8 2 个父辈 d35277b8 1f6dcd65

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
内嵌 并排对比
正在显示 10 个修改的文件 包含 75 行增加 和 49 行删除
@@ -713,7 +713,6 @@ Page({ @@ -713,7 +713,6 @@ Page({
713 for (var i = 0; i < newnavarr.length; i++) { 713 for (var i = 0; i < newnavarr.length; i++) {
714 if (i == index) { 714 if (i == index) {
715 newnavarr[i].sel = !newnavarr[i].sel; 715 newnavarr[i].sel = !newnavarr[i].sel;
716 -  
717 if (type == 4) { 716 if (type == 4) {
718 if (newnavarr[i].sel == true) { 717 if (newnavarr[i].sel == true) {
719 console.log(999) 718 console.log(999)
@@ -732,8 +731,6 @@ Page({ @@ -732,8 +731,6 @@ Page({
732 pricechose: false, 731 pricechose: false,
733 morechose: false, 732 morechose: false,
734 fenchose: false 733 fenchose: false
735 -  
736 -  
737 }) 734 })
738 } 735 }
739 }else if(type==2){ 736 }else if(type==2){
@@ -813,9 +810,6 @@ Page({ @@ -813,9 +810,6 @@ Page({
813 newnavarr[i].sel = false 810 newnavarr[i].sel = false
814 } 811 }
815 } 812 }
816 -  
817 -  
818 -  
819 this.setData({ 813 this.setData({
820 navarr: newnavarr 814 navarr: newnavarr
821 }) 815 })
@@ -857,19 +851,25 @@ Page({ @@ -857,19 +851,25 @@ Page({
857 console.log(that.data.selectinfo) 851 console.log(that.data.selectinfo)
858 852
859 let middlevalue = ''; 853 let middlevalue = '';
860 -  
861 - 854 + let during = that.data.selectinfo.price[0].number;
  855 + let max = parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number);
  856 + let duan = parseInt(max/during);
  857 + let per_val = (during/max*100).toFixed(2);
  858 + let tempData = [];
  859 + for(let i = 1; i<=duan ; i++){
  860 + tempData.push(i)
  861 + }
862 862
863 that.setData({ 863 that.setData({
864 -  
865 leftMin: parseInt(that.data.selectinfo.price[0].realmin), 864 leftMin: parseInt(that.data.selectinfo.price[0].realmin),
866 rightMax: parseInt(that.data.selectinfo.price[0].realmax), 865 rightMax: parseInt(that.data.selectinfo.price[0].realmax),
867 -  
868 min: parseInt(that.data.selectinfo.price[0].min) - parseInt(that.data.selectinfo.price[0].number), 866 min: parseInt(that.data.selectinfo.price[0].min) - parseInt(that.data.selectinfo.price[0].number),
869 max: parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number), 867 max: parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number),
870 priceyuan: that.data.selectinfo.price[0].realmin + '元' + '-' + that.data.selectinfo.price[0].realmax + '元', 868 priceyuan: that.data.selectinfo.price[0].realmin + '元' + '-' + that.data.selectinfo.price[0].realmax + '元',
871 pricevalue: that.data.selectinfo.price[0].realmin + '-' + that.data.selectinfo.price[0].realmax, 869 pricevalue: that.data.selectinfo.price[0].realmin + '-' + that.data.selectinfo.price[0].realmax,
872 - number: that.data.selectinfo.price[0].number 870 + number: that.data.selectinfo.price[0].number,
  871 + during: tempData,
  872 + per_val:per_val
873 }) 873 })
874 console.log(909080807070) 874 console.log(909080807070)
875 875
@@ -26,18 +26,17 @@ @@ -26,18 +26,17 @@
26 <!-- 价格 --> 26 <!-- 价格 -->
27 <view class="register" wx:if="{{pricechose}}" bindtap="hideprice" catchtouchmove='true'> 27 <view class="register" wx:if="{{pricechose}}" bindtap="hideprice" catchtouchmove='true'>
28 <view class="pregisterwrap"> 28 <view class="pregisterwrap">
29 -  
30 <view class="pyuan">{{priceyuan}}</view> 29 <view class="pyuan">{{priceyuan}}</view>
31 -  
32 <view class="zy-slider" catchtap='pingbi'> 30 <view class="zy-slider" catchtap='pingbi'>
33 <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" 31 <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"
34 /> 32 />
35 <!-- style="left:{{ppleft}}rpx; width:{{ppvalue-ppleft}}rpx" --> 33 <!-- style="left:{{ppleft}}rpx; width:{{ppvalue-ppleft}}rpx" -->
36 - <!-- <view class="pp" style="width:67%;background:red;height:10rpx;margin:50rpx auto 0">  
37 - <view class="ppitem"></view>  
38 - <view class="ppitem"></view>  
39 - <view class="ppitem"></view>  
40 - <view class="ppitem"></view> 34 + <view class="pp" style="height:10rpx;margin:50rpx 0 0 5px">
  35 + <block wx:for='{{during}}' wx:key=''>
  36 + <view style="width: {{per_val}}%" class="single_item">
  37 + <view class="detail_num">{{item*number}}</view>
  38 + </view>
  39 + </block>
41 </view> --> 40 </view> -->
42 </view> 41 </view>
43 </view> 42 </view>
@@ -47,12 +46,10 @@ @@ -47,12 +46,10 @@
47 <view class="register" wx:if="{{fenchose}}" bindtap="hidefen" catchtouchmove='true'> 46 <view class="register" wx:if="{{fenchose}}" bindtap="hidefen" catchtouchmove='true'>
48 <view class="pregisterwrap"> 47 <view class="pregisterwrap">
49 <view class="pyuan">{{score}}</view> 48 <view class="pyuan">{{score}}</view>
50 -  
51 <view class="zy-slider"> 49 <view class="zy-slider">
52 <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" 50 <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"
53 /> 51 />
54 </view> 52 </view>
55 -  
56 </view> 53 </view>
57 </view> 54 </view>
58 55
@@ -90,12 +87,7 @@ @@ -90,12 +87,7 @@
90 data-basic_sort="{{item.basic_sort}}" bind:heighValueChange="heighValueChangeAction1" data-parindex="{{par}}" /> 87 data-basic_sort="{{item.basic_sort}}" bind:heighValueChange="heighValueChangeAction1" data-parindex="{{par}}" />
91 </view> 88 </view>
92 </view> 89 </view>
93 -  
94 </view> 90 </view>
95 -  
96 -  
97 -  
98 -  
99 </view> 91 </view>
100 </view> 92 </view>
101 <view class="shaisel"> 93 <view class="shaisel">
@@ -118,8 +110,6 @@ @@ -118,8 +110,6 @@
118 <view class="nodataimg" wx:if="{{zhinenglist.length==0}}"> 110 <view class="nodataimg" wx:if="{{zhinenglist.length==0}}">
119 <image src="/img/wushuju.png"></image> 111 <image src="/img/wushuju.png"></image>
120 </view> 112 </view>
121 -  
122 -  
123 <block wx:else> 113 <block wx:else>
124 <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="" bindtap="jumpbrand" data-id="{{item.id}}"> 114 <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="" bindtap="jumpbrand" data-id="{{item.id}}">
125 <view class="searchitemleft"> 115 <view class="searchitemleft">
@@ -139,9 +129,6 @@ @@ -139,9 +129,6 @@
139 </view> 129 </view>
140 130
141 <view class="starimg" bindtap="collect" data-id="{{item.id}}"> 131 <view class="starimg" bindtap="collect" data-id="{{item.id}}">
142 -  
143 -  
144 -  
145 <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image> 132 <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
146 <image src="{{url}}aicon_09x.png" wx:else></image> 133 <image src="{{url}}aicon_09x.png" wx:else></image>
147 </view> 134 </view>
@@ -325,3 +325,34 @@ page { @@ -325,3 +325,34 @@ page {
325 height:50rpx; 325 height:50rpx;
326 background: green; 326 background: green;
327 } 327 }
  328 +.single_item{
  329 + height: 2px;
  330 + background: #f5f5f5;
  331 + position: relative;
  332 +}
  333 +.single_item::after{
  334 + content:'';
  335 + height: 8px;
  336 + width: 2px;
  337 + background-color: #ccc;
  338 + right: 0;
  339 + position: absolute;
  340 + bottom: 0;
  341 +}
  342 +.single_item:last-child{
  343 + opacity: 0
  344 +}
  345 +.single_item:first-child{
  346 + background: #FFF;
  347 +}
  348 +.single_item:last-child::after{
  349 + height: 0;
  350 +}
  351 +.detail_num{
  352 + color: #999;
  353 + font-size: 24rpx;
  354 + position: absolute;
  355 + top: -25px;
  356 + right: 0;
  357 + transform: translateX(50%);
  358 +}
1 { 1 {
2 - "navigationBarTitleText": "名人酒单" 2 + "navigationBarTitleText": "˾Ƶ"
3 } 3 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="nodataimg" wx:if="{{peoplelist.length==0}}"> 2 <view class="nodataimg" wx:if="{{peoplelist.length==0}}">
3 <image src="/img/wushuju.png"></image> 3 <image src="/img/wushuju.png"></image>
4 </view> 4 </view>
5 -<!-- <view class="noData" wx:if="{{peoplelist.length==0}}">暂无相关数据</view> --> 5 +<!-- <view class="noData" wx:if="{{peoplelist.length==0}}">暂无相关数据</view> -->
6 <view class='wine_list' wx:else> 6 <view class='wine_list' wx:else>
7 <view class='list_item' wx:for="{{peoplelist}}" wx:key="" bindtap="detail" data-id="{{item.id}}"> 7 <view class='list_item' wx:for="{{peoplelist}}" wx:key="" bindtap="detail" data-id="{{item.id}}">
8 <view class='img_box'> 8 <view class='img_box'>
@@ -28,10 +28,10 @@ @@ -28,10 +28,10 @@
28 <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}"> 28 <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
29 <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image> 29 <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
30 <view class='min_action_box'> 30 <view class='min_action_box'>
31 - <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>  
32 - <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view> 31 + <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
  32 + <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
33 33
34 - <view class='action_btn'>分享</view> 34 + <view class='action_btn'>分享</view>
35 <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" ></button> 35 <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}" ></button>
36 </view> 36 </view>
37 </view> 37 </view>
1 { 1 {
2 - "navigationBarTitleText": "修改密码" 2 + "navigationBarTitleText": "޸"
3 } 3 }
1 <view class="setmima"> 1 <view class="setmima">
2 <view class="setmimaleft"> 2 <view class="setmimaleft">
3 - <input password placeholder='原密码' bindinput='inputold' /> 3 + <input password placeholder='原密码' bindinput='inputold' />
4 </view> 4 </view>
5 <view class="mimaeye"> 5 <view class="mimaeye">
6 <image src="{{url}}/bicon_14x.png"></image> 6 <image src="{{url}}/bicon_14x.png"></image>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </view> 8 </view>
9 <view class="setmima"> 9 <view class="setmima">
10 <view class="setmimaleft"> 10 <view class="setmimaleft">
11 - <input password placeholder='新密码' bindinput='inputnew' /> 11 + <input password placeholder='新密码' bindinput='inputnew' />
12 </view> 12 </view>
13 <view class="mimaeye"> 13 <view class="mimaeye">
14 <image src="{{url}}/bicon_14x.png"></image> 14 <image src="{{url}}/bicon_14x.png"></image>
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
16 </view> 16 </view>
17 <view class="setmima"> 17 <view class="setmima">
18 <view class="setmimaleft"> 18 <view class="setmimaleft">
19 - <input password placeholder='确定新密码' bindinput='inputnewque' /> 19 + <input password placeholder='确定新密码' bindinput='inputnewque' />
20 </view> 20 </view>
21 <view class="mimaeye"> 21 <view class="mimaeye">
22 <image src="{{url}}/bicon_14x.png"></image> 22 <image src="{{url}}/bicon_14x.png"></image>
23 </view> 23 </view>
24 </view> 24 </view>
25 -<view class="que" bindtap='confirmPassWord' wx:if="{{passqueding}}">确认</view>  
26 -<view class="queren" wx:else>确认</view>  
27 -<view class="needmi">需要有6-20位数字、字母或符号组成</view> 25 +<view class="que" bindtap='confirmPassWord' wx:if="{{passqueding}}">确认</view>
  26 +<view class="queren" wx:else>确认</view>
  27 +<view class="needmi">需要有6-20位数字、字母或符号组成</view>
1 { 1 {
2 - "navigationBarTitleText": "用户反馈" 2 + "navigationBarTitleText": "û"
3 } 3 }
1 <view class="fankuicontent"> 1 <view class="fankuicontent">
2 - <textarea placeholder='请输入您的意见，我们会积极处理并改正的~' placeholder-class='enterclass' bindinput="enteryijian" /> 2 + <textarea placeholder='请输入您的意见，我们会积极处理并改正的~' placeholder-class='enterclass' bindinput="enteryijian" />
3 3
4 <view class="wordlen">{{contentlen}}/200</view> 4 <view class="wordlen">{{contentlen}}/200</view>
5 </view> 5 </view>
6 6
7 7
8 8
9 -<view class="tijiao" bindtap="tijiao" wx:if="{{istijiao}}">提交</view>  
10 -<view class="tijiao" wx:else>提交</view>  
  9 +<view class="tijiao" bindtap="tijiao" wx:if="{{istijiao}}">提交</view>
  10 +<view class="tijiao" wx:else>提交</view>
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 "ignore": [] 4 "ignore": []
5 }, 5 },
6 "setting": { 6 "setting": {
7 - "urlCheck": true, 7 + "urlCheck": false,
8 "es6": true, 8 "es6": true,
9 "postcss": true, 9 "postcss": true,
10 "minified": true, 10 "minified": true,
11 "newFeature": true, 11 "newFeature": true,
  12 + "coverView": true,
12 "autoAudits": false, 13 "autoAudits": false,
13 "uglifyFileName": true, 14 "uglifyFileName": true,
14 "checkInvalidKey": true, 15 "checkInvalidKey": true,
15 - "coverView": true,  
16 "checkSiteMap": true, 16 "checkSiteMap": true,
17 "uploadWithSourceMap": true, 17 "uploadWithSourceMap": true,
18 "babelSetting": { 18 "babelSetting": {
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 "list": [] 49 "list": []
50 }, 50 },
51 "miniprogram": { 51 "miniprogram": {
52 - "current": 47, 52 + "current": 48,
53 "list": [ 53 "list": [
54 { 54 {
55 "id": -1, 55 "id": -1,
@@ -384,6 +384,14 @@ @@ -384,6 +384,14 @@
384 "id": -1, 384 "id": -1,
385 "name": "用户协议", 385 "name": "用户协议",
386 "pathName": "pages/yonghuxieyi/yonghuxieyi", 386 "pathName": "pages/yonghuxieyi/yonghuxieyi",
  387 + "query": "",
  388 + "scene": null
  389 + },
  390 + {
  391 + "id": -1,
  392 + "name": "pages/homeblock/zhinengselect/zhinengselect",
  393 + "pathName": "pages/homeblock/zhinengselect/zhinengselect",
  394 + "query": "",
387 "scene": null 395 "scene": null
388 } 396 }
389 ] 397 ]