miniprogram / binhaineigouopen · 提交

转到一个项目

作者 lihongjuan
提交 fc8a9b7354a0e17eeac3125ebb57d4fc4f273f6c 1 个父辈 13d4d088

1

内嵌 并排对比
正在显示 12 个修改的文件 包含 43 行增加 和 13 行删除
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <view class='sell'>已卖出{{item.paynum}}件</view> 16 <view class='sell'>已卖出{{item.paynum}}件</view>
17 </view> 17 </view>
18 18
19 - <view class='oldprice'>{{item.price}}</view> 19 + <!-- <view class='oldprice'>{{item.price}}</view> -->
20 </view> 20 </view>
21 21
22 <view class='goods_flex' wx:else> 22 <view class='goods_flex' wx:else>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <image class="num_btn" src="/images/add.png" data-index="{{index}}" data-type="1" data-num="{{item.num}}" data-id="{{item.id}}" data-product_id="{{item.product_id}}" catchtap="num_change"/> 18 <image class="num_btn" src="/images/add.png" data-index="{{index}}" data-type="1" data-num="{{item.num}}" data-id="{{item.id}}" data-product_id="{{item.product_id}}" catchtap="num_change"/>
19 </view> 19 </view>
20 </view> 20 </view>
21 - <view class="oldprice" wx:if="{{item.product.price2!=null||item.price2!=null}}">{{item.product.price||item.price}}</view> 21 + <!-- <view class="oldprice" wx:if="{{item.product.price2!=null||item.price2!=null}}">{{item.product.price||item.price}}</view> -->
22 </view> 22 </view>
23 </view> 23 </view>
24 </view> 24 </view>
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 <view class="list_textarea"> 25 <view class="list_textarea">
26 <view class="list_left">详细地址</view> 26 <view class="list_left">详细地址</view>
27 <view class="list_right"> 27 <view class="list_right">
28 - <textarea placeholder="道路、门牌号、小区、楼栋号等" placeholder-class="inut_plclass" bindinput="getAddressFun" style="padding-top:22rpx;"></textarea> 28 + <!-- style="padding-top:22rpx;" -->
  29 + <textarea placeholder="道路、门牌号、小区、楼栋号等" placeholder-class="inut_plclass" bindinput="getAddressFun" style="padding-top:2rpx;" ></textarea>
29 </view> 30 </view>
30 </view> 31 </view>
31 <view class="list"> 32 <view class="list">
@@ -72,9 +72,6 @@ if( app.globalData.index==undefined){ @@ -72,9 +72,6 @@ if( app.globalData.index==undefined){
72 this.get_info(0, 1); 72 this.get_info(0, 1);
73 } 73 }
74 74
75 -  
76 - this.get_banner()  
77 -  
78 // 获取活动专区 75 // 获取活动专区
79 this.getzhuanqulist(); 76 this.getzhuanqulist();
80 this.getxianshi(); 77 this.getxianshi();
@@ -715,6 +712,8 @@ if( app.globalData.index==undefined){ @@ -715,6 +712,8 @@ if( app.globalData.index==undefined){
715 * 生命周期函数--监听页面显示 712 * 生命周期函数--监听页面显示
716 */ 713 */
717 onShow: function() { 714 onShow: function() {
  715 +
  716 + this.get_banner()
718 console.log(app.globalData.index) 717 console.log(app.globalData.index)
719 if(app.globalData.index==0){ 718 if(app.globalData.index==0){
720 app.globalData.index=undefined 719 app.globalData.index=undefined
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <!-- <view class="id">ID {{obj.id_card}}</view> --> 12 <!-- <view class="id">ID {{obj.id_card}}</view> -->
13 </view> 13 </view>
14 </view> 14 </view>
15 - <view class="company">{{obj.competition}}</view> 15 + <!-- <view class="company">{{obj.competition}}</view> -->
16 <view class="info_box"> 16 <view class="info_box">
17 <view>{{obj.job?obj.job:'暂无'}}</view> 17 <view>{{obj.job?obj.job:'暂无'}}</view>
18 <!-- <view>{{obj.section?obj.section:'暂无'}}</view> --> 18 <!-- <view>{{obj.section?obj.section:'暂无'}}</view> -->
@@ -18,6 +18,13 @@ Page({ @@ -18,6 +18,13 @@ Page({
18 }, 18 },
19 // 展示待支付的去支付弹窗 19 // 展示待支付的去支付弹窗
20 show_cover(e) { 20 show_cover(e) {
  21 + if( app.globalData.status==0){
  22 + wx.showToast({
  23 + title: '您已被拉黑',
  24 + icon:'none'
  25 + })
  26 + return false
  27 + }
21 if (e.currentTarget.dataset.d) { 28 if (e.currentTarget.dataset.d) {
22 let index = Number(e.currentTarget.dataset.index) 29 let index = Number(e.currentTarget.dataset.index)
23 let daiorder = this.data.daiorder 30 let daiorder = this.data.daiorder
@@ -159,7 +159,9 @@ Page({ @@ -159,7 +159,9 @@ Page({
159 }, 159 },
160 //去结算 160 //去结算
161 submit(){ 161 submit(){
162 - let that = this 162 + let that = this;
  163 +
  164 +
163 if (that.data.all_num == 0){ 165 if (that.data.all_num == 0){
164 wx.showToast({ 166 wx.showToast({
165 title: '请先选择商品', 167 title: '请先选择商品',
@@ -168,6 +170,13 @@ submit(){ @@ -168,6 +170,13 @@ submit(){
168 }) 170 })
169 return 171 return
170 } 172 }
  173 + if(app.globalData.status==0){
  174 + wx.showToast({
  175 + title: '您已被拉黑',
  176 + icon:'none'
  177 + })
  178 + return false
  179 + }
171 let list = that.data.list 180 let list = that.data.list
172 let info = [] 181 let info = []
173 for (let obj of list) { 182 for (let obj of list) {
@@ -128,6 +128,13 @@ Page({ @@ -128,6 +128,13 @@ Page({
128 }, 128 },
129 129
130 change_cover(e) { 130 change_cover(e) {
  131 + if( app.globalData.status==0){
  132 + wx.showToast({
  133 + title: '您已被拉黑',
  134 + icon:'none'
  135 + })
  136 + return false
  137 + }
131 if (e.currentTarget.dataset.type) { 138 if (e.currentTarget.dataset.type) {
132 this.setData({ 139 this.setData({
133 btn_type: e.currentTarget.dataset.type 140 btn_type: e.currentTarget.dataset.type
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <view class='price'>{{info.price2==null?info.price:info.price2}}</view> 16 <view class='price'>{{info.price2==null?info.price:info.price2}}</view>
17 </view> 17 </view>
18 18
19 - <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view> 19 + <!-- <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view> -->
20 <view class='two_two'>{{info.name}}</view> 20 <view class='two_two'>{{info.name}}</view>
21 <view class='two_three two_threek'> 21 <view class='two_three two_threek'>
22 <view>库存：{{info.sold}}</view> 22 <view>库存：{{info.sold}}</view>
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <view class='scores'>积分</view> 69 <view class='scores'>积分</view>
70 <view class='prices'>{{info.price2}}</view> 70 <view class='prices'>{{info.price2}}</view>
71 </view> 71 </view>
72 - <view class="oldprice">{{info.price}}</view> 72 + <!-- <view class="oldprice">{{info.price}}</view> -->
73 </view> 73 </view>
74 74
75 75
@@ -115,6 +115,13 @@ Page({ @@ -115,6 +115,13 @@ Page({
115 }, 115 },
116 116
117 change_cover(e) { 117 change_cover(e) {
  118 + if( app.globalData.status==0){
  119 + wx.showToast({
  120 + title: '您已被拉黑',
  121 + icon:'none'
  122 + })
  123 + return false
  124 + }
118 if (e.currentTarget.dataset.type) { 125 if (e.currentTarget.dataset.type) {
119 this.setData({ 126 this.setData({
120 btn_type: e.currentTarget.dataset.type 127 btn_type: e.currentTarget.dataset.type
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <view class="miaogood flextwo"> 24 <view class="miaogood flextwo">
25 <view class="miaogoodleft flexone" wx:if="{{item.price2!=null}}"> 25 <view class="miaogoodleft flexone" wx:if="{{item.price2!=null}}">
26 <view class="saleprice" >¥{{item.price2}}</view> 26 <view class="saleprice" >¥{{item.price2}}</view>
27 - <view class=" oldprice">¥{{item.price}}</view> 27 + <!-- <view class=" oldprice">¥{{item.price}}</view> -->
28 <!-- <view class="yuansaleprice">¥{{}}</view> --> 28 <!-- <view class="yuansaleprice">¥{{}}</view> -->
29 </view> 29 </view>
30 <view class="miaogoodleft flexone" wx:else> 30 <view class="miaogoodleft flexone" wx:else>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <view class='sell'>已卖出{{item.product.paynum}}件</view> 37 <view class='sell'>已卖出{{item.product.paynum}}件</view>
38 </view> 38 </view>
39 39
40 - <view class='oldprice'>{{item.product.price}}</view> 40 + <!-- <view class='oldprice'>{{item.product.price}}</view> -->
41 </view> 41 </view>
42 42
43 <view class='goods_flex' wx:else> 43 <view class='goods_flex' wx:else>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <!-- <view class='sell'>已卖出{{item.combo.paynum}}件</view> --> 68 <!-- <view class='sell'>已卖出{{item.combo.paynum}}件</view> -->
69 </view> 69 </view>
70 70
71 - <view class='oldprice'>{{item.combo.price}}</view> 71 + <!-- <view class='oldprice'>{{item.combo.price}}</view> -->
72 </view> 72 </view>
73 73
74 <view class='goods_flex' wx:else> 74 <view class='goods_flex' wx:else>