maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:79292aa1f32b789491fd6d1a3dfc2c9b3b6252a9
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:05610c513727b75333a00619edcdcb339939a597
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "79292aa1f32b789491fd6d1a3dfc2c9b3b6252a9" and "05610c513727b75333a00619edcdcb339939a597" have entirely different histories.
79292aa1f3 ... 05610c5137

8 changed files with 31 additions and 57 deletions
Show Stats Expand all files Collapse all files

25
packages/advertising/index/index.css
View File

@ -185,30 +185,23 @@
/* 购物车按钮 */ /* 购物车按钮 */
.shop_car { .shop_car {
width: 80rpx; width: 140rpx;
height: 80rpx; height: 140rpx;
position: absolute; position: fixed;
bottom: 150rpx; right: 33rpx;
right: 30rpx; bottom: 80rpx;
z-index: 10; z-index: 10;
border-radius: 50%;
background-color: #ffffff;
padding: 10rpx;
display: flex;
align-items: center;
justify-content: center;
} }
.shop_car image { .shop_car image {
width: 60rpx; width: 100%;
height: 60rpx; height: 100%;
} }
.u-badge { .u-badge {
position: absolute; position: absolute;
right: 0rpx; right: 0;
top: -6rpx; top: -10rpx;
z-index: 11;
} }
/* 规格标签样式 */ /* 规格标签样式 */

2
packages/advertising/index/index.vue
View File

@ -34,7 +34,7 @@
<!-- 购物车按钮 --> <!-- 购物车按钮 -->
<view class="shop_car" @click="shopCar"> <view class="shop_car" @click="shopCar">
<u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge> <u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge>
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1564.png"></image> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_num.png"></image>
</view> </view>
</view> </view>
</template> </template>

2
packages/shop/goods/index.vue
View File

@ -811,7 +811,7 @@ export default {
order_cate: 1, order_cate: 1,
goods_list: [{ goods_list: [{
supplier_id: this.info.supplier_id, supplier_id: this.info.supplier_id,
supplier_name: this.info.merchant_info.merchant_name || '', supplier_name: this.currentGG.supplier_name || '',
is_same_day: this.currentGG.is_same_day, is_same_day: this.currentGG.is_same_day,
receiving_name: this.defAddress.name, receiving_name: this.defAddress.name,
receiving_phone: this.defAddress.phone, receiving_phone: this.defAddress.phone,

25
packages/shop/groupPurchase/index.css
View File

@ -206,30 +206,23 @@
/* 购物车按钮 */ /* 购物车按钮 */
.shop_car { .shop_car {
width: 80rpx; width: 140rpx;
height: 80rpx; height: 140rpx;
position: absolute; position: fixed;
bottom: 150rpx; right: 33rpx;
right: 30rpx; bottom: 80rpx;
z-index: 10; z-index: 10;
border-radius: 50%;
background-color: #ffffff;
padding: 10rpx;
display: flex;
align-items: center;
justify-content: center;
} }
.shop_car image { .shop_car image {
width: 60rpx; width: 100%;
height: 60rpx; height: 100%;
} }
.u-badge { .u-badge {
position: absolute; position: absolute;
right: 0rpx; right: 0;
top: -6rpx; top: -10rpx;
z-index: 11;
} }
/* 规格标签样式 */ /* 规格标签样式 */

2
packages/shop/groupPurchase/index.vue
View File

@ -100,7 +100,7 @@
<!-- 购物车按钮 --> <!-- 购物车按钮 -->
<view class="shop_car" @click="shopCar"> <view class="shop_car" @click="shopCar">
<u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge> <u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge>
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1564.png"></image> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_num.png"></image>
</view> </view>
</view> </view>
</template> </template>

23
packages/shop/index/index.css
View File

@ -577,29 +577,24 @@ page {
} }
.shop_car { .shop_car {
width: 80rpx; width: 140rpx;
height: 80rpx; height: 140rpx;
position: absolute; position: absolute;
bottom: 150rpx; bottom: 100rpx;
right: 30rpx; right: 10rpx;
z-index: 10; z-index: 10;
border-radius: 50%;
background-color: #ffffff;
padding: 10rpx;
display: flex;
align-items: center;
justify-content: center;
} }
.shop_car image { .shop_car image {
width: 60rpx; width: 100%;
height: 60rpx; height: 100%;
} }
.u-badge { .u-badge {
position: absolute; position: absolute;
right: 0rpx; right: 70rpx;
top: -6rpx; /* 调整角标位置，使其在隐藏状态下也能看到 */
top: -10rpx;
z-index: 11; z-index: 11;
} }

2
packages/shop/index/index.vue
View File

@ -210,7 +210,7 @@
<view class="shop_car" @click="shopCar"> <view class="shop_car" @click="shopCar">
<u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge> <u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge>
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1564.png"></image> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_num.png"></image>
<!-- <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_empty.png"></image> --> <!-- <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_empty.png"></image> -->
</view> </view>
</view> </view>

7
packages/shopEnter/index/index.vue
View File

@ -376,13 +376,6 @@ export default {
that.imgList6 = [] that.imgList6 = []
that.confirmClassify = '' that.confirmClassify = ''
NavgateTo("../sucess/index") NavgateTo("../sucess/index")
}).catch(res => {
if(res.message.includes("agent_nil")) {
uni.showToast({
title: '未找到对应的代理商信息',
icon: 'none',
});
}
}) })
}, },