mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-21 10:52:14 +08:00
parent 6543c2cfe0
commit b54aa03dcb
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.8.8", "versionName" : "1.8.9",
"versionCode" : 188, "versionCode" : 189,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

1
pages/gather/gather.vue
View File

@ -72,6 +72,7 @@
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
<view class="locationx" @click.stop="isshow=false">x</view> <view class="locationx" @click.stop="isshow=false">x</view>
</view> </view>
<!-- <view>sss</view> -->
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <m-tabbar native> <!-- <m-tabbar native>

11
pages/order_details/stay.vue
View File

@ -16,7 +16,6 @@
</view> </view>
<view class='data' v-else> <view class='data' v-else>
<view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快完成支付!</view> <view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快完成支付!</view>
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view> <view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
</view> </view>
</view> </view>
@ -73,8 +72,10 @@
<view class="item"> <view class="item">
<image :src="goods.cart_info.product.image"></image> <image :src="goods.cart_info.product.image"></image>
<view class="info-box"> <view class="info-box">
<view class="name line1"><text <view class="name line1">
class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}} <!-- <text
class="event_name event_bg">预售</text> -->
{{goods.cart_info.product.store_name}}
</view> </view>
<view class="msg">{{goods.cart_info.productAttr.sku}}</view> <view class="msg">{{goods.cart_info.productAttr.sku}}</view>
<view class="event_ship event_color">发货时间： <view class="event_ship event_color">发货时间：
@ -89,9 +90,9 @@
<view class="num"><text <view class="num"><text
class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}} class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}
</view> </view>
<view class="bnt"> <!-- <view class="bnt">
立即付款 立即付款
</view> </view> -->
</view> </view>
<view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1"> <view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1">
<view class="progress_list"> <view class="progress_list">

6
pages/store/settled/unit.vue
View File

@ -1008,9 +1008,9 @@ import { Toast } from '../../../libs/uniApi';
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({ if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
title: '请输入正确的手机号码' title: '请输入正确的手机号码'
}); });
if (!this.isAgree) return this.$util.Tips({ // if (!this.isAgree) return this.$util.Tips({
title: '请勾选并同意入驻协议' // title: '请勾选并同意入驻协议'
}); // });
this.$refs.verify.show(); this.$refs.verify.show();
} }
} }