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

Compare commits

base: maguodong:686a9df6e19c5bf0065d3b159baae53fc4876d32
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:e9488a27770e9397248b7770d9f3caa9e92a6f53
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "686a9df6e19c5bf0065d3b159baae53fc4876d32" and "e9488a27770e9397248b7770d9f3caa9e92a6f53" have entirely different histories.
686a9df6e1 ... e9488a2777

4 changed files with 47 additions and 159 deletions
Show Stats Expand all files Collapse all files

6
packages/advertising/goodsDetail/index.vue
View File

@ -727,14 +727,14 @@ export default {
// 购买记录 // 购买记录
getBuyRecord() { getBuyRecord() {
const params = { const params = {
activity_id: this.groupById, activity_id: 47,
goods_id: this.itemObj.id, goods_id: this.id
} }
request(apiArr2.groupBuyRecord, 'POST', params).then(res => { request(apiArr2.groupBuyRecord, 'POST', params).then(res => {
const record = res.group_buy_record.map(item => { const record = res.group_buy_record.map(item => {
return { return {
...item, ...item,
avatar: picUrl + item.avatar avatar: picture + item.avatar
} }
}) })
this.purchaseRecords = record this.purchaseRecords = record

45
packages/shop/goodsSubmit/index.vue
View File

@ -109,9 +109,6 @@
</view> </view>
<view class="boxshadow_img"> <view class="boxshadow_img">
<view v-if="verifyCode">核销码：{{ verifyCode }}</view> <view v-if="verifyCode">核销码：{{ verifyCode }}</view>
<!-- <image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_share_img.png">
</image> -->
</view> </view>
<view> <view>
<view class="wealBoxTit"> <view class="wealBoxTit">
@ -121,7 +118,8 @@
<view class="wealBox"> <view class="wealBox">
<view class="wealBoxItem wealBoxItem1"> <view class="wealBoxItem wealBoxItem1">
<view class="wealBoxItemTop"> <view class="wealBoxItemTop">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_fen.png" mode="aspectFit"> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_fen.png"
mode="aspectFit">
</image> </image>
<view>石榴分</view> <view>石榴分</view>
</view> </view>
@ -134,7 +132,8 @@
</view> </view>
<view class="wealBoxItem wealBoxItem2"> <view class="wealBoxItem wealBoxItem2">
<view class="wealBoxItemTop"> <view class="wealBoxItemTop">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_zi.png" mode="aspectFit"> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_zi.png"
mode="aspectFit">
</image> </image>
<view>石榴籽</view> <view>石榴籽</view>
</view> </view>
@ -147,7 +146,8 @@
</view> </view>
<view class="wealBoxItem wealBoxItem3"> <view class="wealBoxItem wealBoxItem3">
<view class="wealBoxItemTop"> <view class="wealBoxItemTop">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_jin.png" mode="aspectFit"/> <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_jin.png"
mode="aspectFit" />
<view>石榴金</view> <view>石榴金</view>
</view> </view>
<view> <view>
@ -159,39 +159,6 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bottom">
<view class="boxbottom1">
<view class="boxbottom">
<view class="line1"></view>
赶快邀请好友来下单吧
<view class="line2"></view>
</view>
<view @click.stop="changeShadow">
<view class="shadowBox1">
<button class="shadowBox1Item_btn" open-type="share" bindtap="onShareButtonClick" />
<view class="shadowBox1Item">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
mode="aspectFill"></image>
微信好友
</view>
<button class="shadowBox2Item_btn" open-type="share" bindtap="onShareButtonClick" />
<view class="shadowBox1Item" @click="shareFriend">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
mode="aspectFill"></image>
小程序链接
</view>
<!-- <view class="shadowBox1Item" @click="openSave">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_saveImg.png"
mode="aspectFill"></image>
二维码海报
</view> -->
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>

76
packages/shop/groupPurchaseDetail/index.css
View File

@ -172,18 +172,18 @@ image {
margin-top: 20rpx; margin-top: 20rpx;
} }
.timeBox { .timeBox{
display: flex; display: flex;
color: #ff370e; color: #ff370e;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.dayTimeBox { .dayTimeBox{
margin-right: 10rpx; margin-right: 10rpx;
} }
.time { .time{
padding: 5rpx; padding: 5rpx;
color: #fff; color: #fff;
border-radius: 10rpx; border-radius: 10rpx;
@ -333,7 +333,7 @@ image {
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.num { .num{
color: #808080; color: #808080;
font-size: 24rpx; font-size: 24rpx;
position: absolute; position: absolute;
@ -349,9 +349,10 @@ image {
} }
.GGBox { .GGBox {
margin: 30rpx 20rpx 20rpx 20rpx; margin: 0 20rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 30rpx;
} }
.GG_rigth { .GG_rigth {
@ -441,48 +442,12 @@ image {
font-weight: 700; font-weight: 700;
} }
.specification {
height: 100rpx;
display: flex;
align-items: center;
}
.spe_Item {
margin: 0 20rpx;
}
.shu {
height: 60rpx;
width: 1rpx;
border-left: 1rpx solid #d8d7d7;
}
.spe_ItemCon {
display: flex;
align-items: center;
}
.spe_ItemCon image {
width: 26rpx;
height: 26rpx;
margin-left: 10rpx;
}
.spe_ItemCon {
font-size: 26rpx;
font-weight: bold;
}
.spe_ItemTit {
font-size: 26rpx;
color: #999999;
margin-top: 5rpx;
}
.Msg_Item { .Msg_Item {
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1rpx solid #EBEBEB; border-bottom: 1rpx solid #EBEBEB;
;
} }
.Msg_ItemTit { .Msg_ItemTit {
@ -504,7 +469,6 @@ image {
.Msg_ItemCon image { .Msg_ItemCon image {
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin-left: 10rpx;
} }
.GoosMsg { .GoosMsg {
@ -543,29 +507,11 @@ image {
height: 40rpx; height: 40rpx;
} }
.car_right_box{
display: flex;
}
.car_right { .car_right {
width: 220rpx; width: 470rpx;
height: 70rpx; height: 70rpx;
/* background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%); */ background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
background: #ff712c; border-radius: 100rpx 100rpx 100rpx 100rpx;
border-radius: 20rpx 0 0 20rpx;
font-size: 36rpx;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
margin-top: 26rpx;
}
.seckill {
width: 220rpx;
height: 70rpx;
background: #ff3b31;
border-radius: 0 20rpx 20rpx 0;
font-size: 36rpx; font-size: 36rpx;
color: #FFFFFF; color: #FFFFFF;
display: flex; display: flex;
@ -978,7 +924,7 @@ image {
align-items: center; align-items: center;
} }
.buy-btn { .buy-btn{
width: 150rpx; width: 150rpx;
height: 50rpx; height: 50rpx;
line-height: 50rpx; line-height: 50rpx;

79
packages/shop/groupPurchaseDetail/index.vue
View File

@ -54,16 +54,9 @@
</view> </view>
<view class="Money"> <view class="Money">
<!-- <view class="MoneyMark">￥</view> <view class="MoneyMark">￥</view>
{{ currentGG.group_buy_price }} {{ currentGG.group_buy_price }}
<view class="MoneyUnit">/{{ currentGG.goods_unit }}</view> --> <view class="MoneyUnit">/{{ currentGG.goods_unit }}</view>
<view class="Tit">
<view class="tag tag-text" v-if="
currentGG.is_same_day
">当日达</view>
{{ currentGG.goods_name }}
</view>
<view class="Msg">{{ currentGG.commodity_brief }}</view>
<view class="num">已售{{ soldOutNum }} | 剩余{{ currentGG.total_stock }}</view> <view class="num">已售{{ soldOutNum }} | 剩余{{ currentGG.total_stock }}</view>
</view> </view>
@ -81,26 +74,14 @@
</view> </view>
</view> </view>
<view class="fenge"></view> <view class="Tit">
<view class="specification"> <view class="tag tag-text" v-if="
<view class="spe_Item"> currentGG.is_same_day
<view class="spe_ItemCon" @click="copys(currentGG.goods_no)"> ">当日达</view>
{{ currentGG.goods_no }} {{ currentGG.goods_name }}
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_copy.png"></image>
</view>
<view class="spe_ItemTit">货号</view>
</view>
<view class="shu"></view>
<view class="spe_Item">
<view class="spe_ItemCon">{{ currentGG.goods_spec }}</view>
<view class="spe_ItemTit">规格说明</view>
</view>
<view class="shu"></view>
<view class="spe_Item">
<view class="spe_ItemCon">{{ currentGG.goods_unit }}</view>
<view class="spe_ItemTit">售卖单位</view>
</view>
</view> </view>
<view class="Msg">{{ currentGG.commodity_brief }}</view>
<view class="fenge"></view> <view class="fenge"></view>
<!-- 已购买区域 --> <!-- 已购买区域 -->
@ -127,9 +108,9 @@
<view class="fenge"></view> <view class="fenge"></view>
<h3 class="GoodsMsg" v-if="currentGG.goods_detail_pic && currentGG.goods_detail_pic.length > 0">商品详情</h3> <h3 class="GoodsMsg">商品详情</h3>
<!-- <view class="Msg_Item"> <view class="Msg_Item">
<view class="Msg_ItemTit">货号</view> <view class="Msg_ItemTit">货号</view>
<view class="Msg_ItemCon" @click="copys(currentGG.goods_no)"> <view class="Msg_ItemCon" @click="copys(currentGG.goods_no)">
{{ currentGG.goods_no }} {{ currentGG.goods_no }}
@ -143,7 +124,7 @@
<view class="Msg_Item"> <view class="Msg_Item">
<view class="Msg_ItemTit">售卖单位</view> <view class="Msg_ItemTit">售卖单位</view>
<view class="Msg_ItemCon">{{ currentGG.goods_unit }}</view> <view class="Msg_ItemCon">{{ currentGG.goods_unit }}</view>
</view> --> </view>
<view class="GoosMsg"> <view class="GoosMsg">
<image v-for="item in currentGG.goods_detail_pic" :src="picUrl + item" :key="item" mode="widthFix"></image> <image v-for="item in currentGG.goods_detail_pic" :src="picUrl + item" :key="item" mode="widthFix"></image>
@ -184,25 +165,19 @@
已售罄 已售罄
</view> </view>
<view class="car_right_box"> <view class="car_right" v-if="
<view class="car_right" v-if=" info.commodity_goods_info_list[currentGGIndex].total_stock > 0 &&
info.commodity_goods_info_list[currentGGIndex].total_stock > 0 && (!info.commodity_goods_info_list[currentGGIndex].cart_count ||
(!info.commodity_goods_info_list[currentGGIndex].cart_count || info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0)
info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0) " @click="addCar">
" @click="addCar"> 加入购物车
加入购物车 </view>
</view>
<view class="car_right" @click="changeCar" v-if=" <view class="car_right" @click="changeCar" v-if="
info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0 info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0
&& info.commodity_goods_info_list[currentGGIndex].total_stock > 0 && info.commodity_goods_info_list[currentGGIndex].total_stock > 0
"> ">
加入购物车 加入购物车
</view>
<view class="seckill">
立即秒杀
</view>
</view> </view>
</view> </view>
@ -795,14 +770,14 @@ export default {
// 购买记录 // 购买记录
getBuyRecord() { getBuyRecord() {
const params = { const params = {
activity_id: this.groupById, activity_id: 47,
goods_id: this.itemObj.id, goods_id: this.id
} }
request(apiArr2.groupBuyRecord, 'POST', params).then(res => { request(apiArr2.groupBuyRecord, 'POST', params).then(res => {
const record = res.group_buy_record.map(item => { const record = res.group_buy_record.map(item => {
return { return {
...item, ...item,
avatar: picUrl + item.avatar avatar: picture + item.avatar
} }
}) })
this.purchaseRecords = record this.purchaseRecords = record