mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标题修改 退款节流

Browse Source
This commit is contained in:
1154079537 2024-04-29 17:17:57 +08:00
parent b7be385655
commit 0f6fdff8fe
5 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -537,7 +537,6 @@
/*#endif*/ /*#endif*/
// 圆形指示点 // 圆形指示点
.circular { .circular {
/deep/.uni-swiper-dot, /deep/.uni-swiper-dot,
/deep/.wx-swiper-dot { /deep/.wx-swiper-dot {
width: 10rpx; width: 10rpx;
@ -553,7 +552,6 @@
// 方形指示点 // 方形指示点
.square { .square {
/deep/.uni-swiper-dot, /deep/.uni-swiper-dot,
/deep/.wx-swiper-dot { /deep/.wx-swiper-dot {
width: 20rpx; width: 20rpx;

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "2.0.39", "versionName" : "2.0.41",
"versionCode" : 2039, "versionCode" : 2041,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

16
pages/goods_details/index.vue
View File

@ -87,7 +87,6 @@
</view> </view>
</view> </view>
<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect' style=""> <view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect' style="">
<text v-if="storeInfo.max_integral > 0" class='integral' <text v-if="storeInfo.max_integral > 0" class='integral'
style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text> style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
@ -158,12 +157,7 @@
{{storeInfo.store_info}} {{storeInfo.store_info}}
</view> </view>
</view> </view>
<!-- <view class='attribute acea-row row-between-wrapper skeleton-rect'>
<view class="acea-row row-between-wrapper">{{attrTxt}}：
<text class='atterTxt'>{{attrValue}}</text>
</view>
<view class='iconfont icon-jiantou'></view>
</view> -->
<view v-if="specsInfo.params && specsInfo.params.length>0" <view v-if="specsInfo.params && specsInfo.params.length>0"
class="attribute acea-row row-between-wrapper" @click="seeSpecs"> class="attribute acea-row row-between-wrapper" @click="seeSpecs">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -269,17 +263,11 @@
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
hover-class="none" class="info"> hover-class="none" class="info">
<view class="name line1"> <view class="name line1">
<text>{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text> <text class="line1" style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
<image <image
v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10" v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
:src="margin_ico" class="store-margin"></image> :src="margin_ico" class="store-margin"></image>
<!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8 bt-color">自营</text> -->
</view> </view>
<!-- <view v-if="storeInfo.merchant.care_count" class="txt">
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
</view>
<view v-else class="txt">0人关注</view> -->
</navigator> </navigator>
<navigator v-if="hide_mer_status != 1" <navigator v-if="hide_mer_status != 1"
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"

9
pages/users/order_list/index.vue
View File

@ -106,9 +106,7 @@
<view class='title acea-row row-between-wrapper'> <view class='title acea-row row-between-wrapper'>
<view class="acea-row row-middle left-wrapper"> <view class="acea-row row-middle left-wrapper">
<text class="iconfont icon-shangjiadingdan"></text> <text class="iconfont icon-shangjiadingdan"></text>
<view class="store-name"> <view class="store-name line1">{{item.orderList[0].merchant.mer_name}}</view>
<view>{{item.orderList[0].merchant.mer_name}}</view>
</view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<view class='t-color'> <view class='t-color'>
@ -215,8 +213,8 @@
<view class='title acea-row row-between-wrapper'> <view class='title acea-row row-between-wrapper'>
<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)"> <view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
<text class="iconfont icon-shangjiadingdan"></text> <text class="iconfont icon-shangjiadingdan"></text>
<view class="store-name"> <view class="store-name line1">
<view>{{item.merchant.mer_name}}</view> {{item.merchant.mer_name}}
</view> </view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
@ -1106,6 +1104,7 @@
} }
.store-name { .store-name {
max-width: 400rpx;
margin: 0 10rpx; margin: 0 10rpx;
} }

2
pages/users/refund/confirm.vue
View File

@ -61,7 +61,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btn-box" @click="bindComfirm">申请退款</view> <view class="btn-box" @click="$u.throttle(bindComfirm, 1000)">申请退款</view>
<alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox> <alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox>
</view> </view>
</template> </template>