@@ -266,7 +266,7 @@
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
this.sotreParam.category_id= options.cate_id && options.cate_id.split(',').toString() || ''
this.storeList = [];
- if(this.mer_location)this.selfLocation()
+ // if(this.mer_location)this.selfLocation()
setTimeout(()=>{
this.storeMerchantList();
},500)
@@ -751,6 +751,10 @@
border: none!important;
border-radius: 0!important;
}
+ .txt {
+ // flex: 1;
+ max-width: 440rpx;
+ }
.mer-item {
margin-bottom: 20rpx;
background-color: #fff;
@@ -784,9 +788,6 @@
border-radius: 50%;
margin-right: 10rpx;
}
- .txt {
- flex: 1;
- }
}
}
/deep/.easy-loadimage{
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 6b0aa9d..4159636 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -53,8 +53,7 @@
- 我已同意《隐私政策》
-
+ 我已同意《用户协议》与《隐私政策》
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 90e1bbd..388d0af 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -402,17 +402,29 @@
-¥{{coupon_price}}