合并主分支

version/0412
wangdong 11 months ago
commit 31b1c9d673
  1. 7
      pages.json
  2. 16
      pages/activity/newPeople.vue
  3. 49
      pages/activity/seckill.vue
  4. 30
      pages/cart/index.vue
  5. 26
      pages/dealer/withdraw/apply.vue
  6. 6341
      pages/goods/city.vue
  7. 27
      pages/goods/components/SkuPopup.vue
  8. 26
      pages/goods/components/setPrice.vue
  9. 57
      pages/goods/detail.vue
  10. 49
      pages/goods/list.vue
  11. 2256
      pages/goods/seckillDetail.vue
  12. 45
      pages/index/index.vue
  13. 665
      pages/login/index.vue
  14. 9
      pages/news/consult/about.vue
  15. 3
      pages/news/user/rechargeList.vue
  16. 291
      pages/news1/jinqun.vue
  17. 6
      pages/order/detail.vue
  18. 4
      pages/sureOrder/index.vue
  19. 31
      pages/user/index.vue
  20. 20
      pages/user/vip/goods.vue

@ -709,6 +709,13 @@
"navigationStyle": "custom"
// "navigationBarTitleText": "商品详情页"
}
},
{
"path": "seckillDetail",
"style": {
"navigationStyle": "custom"
// "navigationBarTitleText": "商品详情页"
}
}
]
},

@ -28,9 +28,9 @@
:is-scroll="true" font-size="30" v-model="current" @change="onChosed"></u-tabs>
</view>
<view scroll-x class="b">
<u-waterfall v-model="goodList" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="item" v-for="(item, index) in leftList" :key="index"
<!-- <u-waterfall v-model="goodList" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="item" v-for="(item, index) in goodList" :key="index"
@click="goDetail(item.goods_id)">
<image :src="item.goods_image" mode="widthFix"></image>
<view class="title">
@ -43,8 +43,8 @@
<view class="o">{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
</view>
</view>
</template>
<template v-slot:right="{rightList}">
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="item" v-for="(item, index) in rightList" :key="index"
@click="goDetail(item.goods_id)">
<image :src="item.goods_image" mode="widthFix"></image>
@ -58,8 +58,8 @@
<view class="o">{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
<u-empty text="暂无数据显示哦~" v-if="goodList.length==0" mode="list"></u-empty>
</view>
</view>
@ -160,7 +160,7 @@
let app = this;
app.current = index;
app.goodList = []
app.$refs.uWaterfall1.clear();
// app.$refs.uWaterfall1.clear();
app.getListgoodData(index != 0 ? app.menuList[index].category_id : '')
},
openPage() {

@ -10,11 +10,11 @@
<image src="/static/seckill/limit.png" mode="" class="img"></image>
</view>
<view class="time" v-if="tabbar.length">
<view class="timeItem" v-for="(item,index) in tabbar" :key="index" @click="handleTab(index)" >
<view class="timeItem" v-for="(item,index) in tabbar" :key="index" @click="handleTab(index)">
<view class="num" :class="[index==curTabIndex ? 'numselected' : '']">
{{item.active_time}}
</view>
<view class="desc" :class="[index==curTabIndex ? 'descselected' : '']">
<view class="desc" :class="[index==curTabIndex ? 'descselected' : '']">
{{item.status_text}}
</view>
</view>
@ -32,7 +32,7 @@
</view>
<view class="goodsList">
<view class="goodItem" v-for="(item,index) in goodsList" :key="index"
@click="handleTargetGoods(item.goods_id)">
@click="handleTargetGoods(item.sharp_goods_id)">
<view class="itemImg">
<image :src="item.goods_image" mode="widthFix" class="goodsImg"></image>
</view>
@ -126,7 +126,7 @@
background: 'url(https://www.royaum.com.cn/static/rank/rank1.png) center top no-repeat',
backgroundSize: '100% auto',
},
backgroundImg:'',
backgroundImg: '',
}
},
computed: {
@ -177,8 +177,8 @@
.then(result => {
app.tabbar = result.data.tabbar;
app.goodsList = result.data.goodsList.data
if(app.goodsList && app.goodsList.length > 0){
app.goodsList.map(a=>{
if (app.goodsList && app.goodsList.length > 0) {
app.goodsList.map(a => {
a.original_price = Number(a.original_price)
a.seckill_price_max = Number(a.seckill_price_max)
a.seckill_price_min = Number(a.seckill_price_min)
@ -266,13 +266,17 @@
//
handleTargetGoods(sharpGoodsId) {
let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/')).getTime()-new Date().getTime()
let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/'))
.getTime() - new Date().getTime()
uni.navigateTo({
url: '/pages/goods/detail?goodsId=' + sharpGoodsId+"&isSeckill="+true+'&isBuy='+count_down_time+'&seckillText='+(this.tabbar[this.curTabIndex].status == this.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始' )
url: '/pages/goods/seckillDetail?activeTimeId=' + this.getCurTabbarId() + '&sharpGoodsId=' + sharpGoodsId +
"&isSeckill=" + true + '&isBuy=' + count_down_time + '&seckillText=' + (this.tabbar[this
.curTabIndex].status == this.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始')
})
},
//
setWxofficialShareData() {
this.updateShareCardData({
@ -317,9 +321,11 @@
width: 100%;
height: 100%;
}
.active{
.active {
background-color: #A9A9A9;
}
.title {
width: 100%;
height: 500rpx;
@ -356,9 +362,11 @@
overflow: auto;
bottom: 0;
position: absolute;
.timeItem {
margin-bottom: 25rpx;
padding: 0 0 0 20rpx;
.num {
width: 150rpx;
font-size: 40rpx;
@ -369,9 +377,11 @@
text-align: center;
margin-top: 10rpx;
}
.numselected{
color:#ffffff;
.numselected {
color: #ffffff;
}
.desc {
width: 150rpx;
height: 40rpx;
@ -386,8 +396,9 @@
margin-top: 10rpx;
text-align: center;
}
.descselected{
color:#FB3D27;
.descselected {
color: #FB3D27;
background: #FFFFFF;
}
}
@ -447,6 +458,7 @@
.goodsList {
overflow: hidden;
.goodItem {
width: 686rpx;
height: 342rpx;
@ -457,10 +469,12 @@
padding: 48rpx 32rpx 36rpx 0;
margin: 0 auto;
margin-top: 22rpx;
.itemImg {
width: 258rpx;
height: 258rpx;
margin-right: 10rpx;
.goodsImg {
width: 100%;
height: 100%;
@ -491,6 +505,7 @@
.info {
display: flex;
.price {
height: 40rpx;
font-size: 28rpx;
@ -509,6 +524,7 @@
background-image: url('https://www.royaum.com.cn/static/seckill/bottom.png');
background-size: 100% 100%;
margin: 0 12rpx 0 14rpx;
.delText {
width: 132rpx;
text-align: center;
@ -555,7 +571,8 @@
font-weight: 500;
color: #FF423D;
margin-left: 26rpx;
text{
text {
font-size: 34rpx;
}
}

@ -68,9 +68,9 @@
</image>
</view>
<view class="goodsRecommend">
<u-waterfall v-model="goodsRecommend" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="goodsItem" v-for="(item,index) in leftList" @click="onTargetGoods(item.goods_id)"
<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="onTargetGoods(item.goods_id)"
:key="index">
<view class="pic">
<image :src="item.goods_image" mode="aspectFill"></image>
@ -116,9 +116,9 @@
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</template>
<template v-slot:right="{rightList}">
</view>
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
@click="onTargetGoods(item.goods_id)" :key="index">
<view class="pic">
@ -130,7 +130,6 @@
<text class="name">{{item.goods_name}}</text>
</view>
</view>
<!-- 商品价格 -->
<view class="shenBox">
<view class="detail-price oneline-hide">
<text class="goods-price f-30 col-m"><text
@ -141,12 +140,12 @@
</view>
<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
</view>
<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="oneTip">
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
</view>
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -164,10 +163,10 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
<u-empty text="暂无数据显示哦~" v-if="goodsRecommend.length==0" mode="list"></u-empty>
</view>
@ -489,6 +488,9 @@
.goodsRecommend {
overflow: hidden;
margin: 10rpx 22rpx 20rpx 22rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.goodsItem {
width: 348rpx;
@ -497,7 +499,7 @@
background-color: #ffffff;
padding: 20rpx;
box-sizing: border-box;
margin: 0rpx 14rpx 20rpx 0;
margin: 0rpx 0 20rpx 0;
.pic {
width: 100%;

@ -20,8 +20,8 @@
<view class="capital__item dis-flex flex-y-center">
<view class="item__left">{{ words.money.value }}</view>
<view class="item__right flex-box">
<input class="input" v-model="inputValue" type="digit" name="money"
@blur="wordsAmount" :placeholder="words.money_placeholder.value" />
<input class="input" v-model="inputValue" type="digit" name="money" @blur="wordsAmount"
:placeholder="words.money_placeholder.value" />
</view>
</view>
</view>
@ -150,7 +150,6 @@
methods: {
wordsAmount(e) {
let that=this
let amount = e.detail.value
let num = null
num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
@ -169,19 +168,26 @@
.replace(/\./g, "")
.replace("$#$", ".")
}
if (num > Number(that.settlement.min_money)) {
if (Number(this.dealer.money) == 0) {
uni.showToast({
title: that.settlement.min_money > 0 ? `最多可用${Number(that.settlement.min_money)}元, 请重新输入` :
'暂无可提现金额',
title: `暂无可提现金额`,
icon: 'none',
duration: 2000
})
that.inputValue = ''
that.$forceUpdate();
this.inputValue = ''
this.$forceUpdate();
} else if (Number(this.settlement.min_money) > num) { // value100, 100100
uni.showToast({
title: `最低可提现金额为${Number(this.settlement.min_money)}元, 请重新输入`,
icon: 'none',
duration: 2000
})
this.inputValue = ''
this.$forceUpdate();
} else {
if (!num) { // value,amount0,
that.inputValue = ''
that.$forceUpdate();
this.inputValue = ''
this.$forceUpdate();
}
}
},

File diff suppressed because it is too large Load Diff

@ -4,7 +4,8 @@
:addCartColor="appTheme.viceText" :addCartBackgroundColor="appTheme.viceBg"
:activedStyle="{ color: appTheme.mainBg, borderColor: appTheme.mainBg, backgroundColor: activedBtnBackgroundColor }"
@open="openSkuPopup" @close="closeSkuPopup" @add-cart="addCart" @buy-now="buyNow" @num-change='numChange'
@selected-old='selectedOld' buyNowText="立即购买" :maxBuyNum="maxBuyNum" :addressResult='addressResult' :stockValue='stockValue'/>
@selected-old='selectedOld' buyNowText="立即购买" :maxBuyNum="maxBuyNum" :addressResult='addressResult'
:stockValue='stockValue' />
</template>
<script>
@ -24,6 +25,18 @@
},
emits: ['update:modelValue'],
props: {
goodSource: {
Type: String || Number,
default: 0
},
activeTimeId: {
Type: String || Number,
default: null
},
sharpGoodsId: {
Type: String || Number,
default: null
},
//
modelValue: {
Type: Boolean,
@ -102,7 +115,7 @@
goods_id: item.goods_id,
goods_name: goods_name,
image: item.image_url ? item.image_url : goods_image,
price: item.goods_price * 100,
price: app.goodSource==0?item.goods_price * 100:item.seckill_price* 100,
stock: item.stock_num,
spec_value_ids: item.spec_value_ids,
sku_name_arr: app.getSkuNameArr(item.spec_value_ids)
@ -213,7 +226,7 @@
let that = this;
let params = {
list: [{
goods_id:selectShop.goods_id,
goods_id: selectShop.goods_id,
num: selectShop.buy_num
}],
province: that.addressResult ? that.addressResult.province : '江苏省',
@ -281,14 +294,16 @@
this.onChangeValue(false);
uni.$emit("onenPrice", selectShop)
return;
console.log(selectShop)
}
//
this.$navTo('pages/sureOrder/index', {
mode: 'buyNow',
mode: app.goodSource == 0 ? 'buyNow' : 'sharp',
goodsId: selectShop.goods_id,
goodsSkuId: selectShop.goods_sku_id,
goodsNum: selectShop.buy_num
goodsNum: selectShop.buy_num,
goodSource: app.goodSource,
activeTimeId: app.activeTimeId,
sharpGoodsId: app.sharpGoodsId,
})
//
this.onChangeValue(false)

@ -16,7 +16,7 @@
{{startTime?startTime:'起始时间'}}
</view>
</view>
<view class="priceCon" v-if="secondQuota">
<view class="priceCon">
<text>秒杀时长</text>
<input type="number" style="width: 130rpx;margin-right: 15rpx;" class="input" v-model="sec_hour"
placeholder="请输入"> /
@ -44,8 +44,9 @@
</view>
</u-popup>
</view>
<u-calendar v-model="timeShow" mode="date" minDate='0' @change="getTime" :pickerOptions="pickerOptions"
range-color='#FF6257' range-bg-color='#FFBDBA' active-bg-color='#FF6257'></u-calendar>
<u-picker v-model="timeShow" mode="time" @confirm="getTime" :params="params"></u-picker>
<!-- <u-calendar v-model="timeShow" mode="date" minDate='0' @change="getTime" :pickerOptions="pickerOptions"
range-color='#FF6257' range-bg-color='#FFBDBA' active-bg-color='#FF6257'></u-calendar> -->
</template>
<script>
@ -57,9 +58,17 @@
startTime: '',
sec_hour: '',
secondPrice: '',
secondQuota: 1,
secondQuota: false,
quotaNum: '',
fontColor: '#262626',
params: {
year: true,
month: true,
day: true,
hour: true,
minute: true,
second: true
},
}
},
methods: {
@ -70,7 +79,7 @@
this.quotaNum = null
},
getTime(e) {
this.startTime = e.result;
this.startTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second;
},
submit() {
if (!this.secondPrice) {
@ -79,7 +88,7 @@
if (!this.startTime) {
return this.$toast('请选择开始时间')
}
if (!this.sec_hour) {
if (!this.sec_hour && this.secondQuota) {
return this.$toast('请输入秒杀时长')
}
if (!this.quotaNum && this.secondQuota) {
@ -168,11 +177,11 @@
}
.selectTime {
width: 300rpx;
width: 358rpx;
height: 70rpx;
background: #F3F3F3;
border-radius: 44rpx;
text-align: center;
text-align: left;
line-height: 70rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
@ -180,6 +189,7 @@
color: #A1A1A1;
font-style: normal;
text-transform: none;
padding-left: 30rpx;
}
text {

@ -33,7 +33,7 @@
<text class="sellLeft"></text>{{goods.line_price_min?Number(goods.line_price_min):0}}
</view>
</view>
<view class="right" >
<view class="right">
<view class="rightPrice" v-if="goods.is_check==1">
<image :src="$picUrl+'/static/detail/shenhe.png'" style="width: 44rpx;height: 42rpx;"></image>
</view>
@ -49,10 +49,10 @@
v-else>{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}}</text>
</view>
<view class="rightBox" v-if="isSeckill" style="background:unset;padding:unset;">
<text class="span" style="color: #ffffff;font-size: 45rpx;font-family: STXinwei;"
>限时抢购</text>
<text class="span" style="color: #ffffff;font-size: 45rpx;font-family: STXinwei;">限时抢购</text>
</view>
<view class="rest" v-if="isSeckill" style="display: inline-flex;color:#ffffff;font-size: 30rpx;margin-top: 5rpx;float: right;font-family: STXinwei;width: 300rpx;">
<view class="rest" v-if="isSeckill"
style="display: inline-flex;color:#ffffff;font-size: 30rpx;margin-top: 5rpx;float: right;font-family: STXinwei;width: 300rpx;">
<text style="margin-right: 20rpx;font-family: STXinwei;">距活动{{seckillText}}</text>
<u-count-down :timestamp="isBuy" format="HH:mm:ss" autoStart
@change="onChangeSeckillCutDownTime">
@ -200,7 +200,7 @@
</view>
</view>
</view>
<!-- <view class="about">
<!-- <view class="about">
<view class="aboutHead">
<view class="aboutSuggest">
相关推荐
@ -520,7 +520,7 @@
multiArray: [],
multiData: [],
stockValue: '有货',
promise_info:'',
promise_info: '',
timeData: {},
addressResult: {
province: '江苏省',
@ -530,6 +530,7 @@
}
},
onLoad(options) {
console.log(options)
const that = this;
that.options = options;
let result = uni.getStorageSync("addressResult")
@ -599,7 +600,7 @@
goods_id: this.goodsId,
num: this.selectNum
}],
province: this.addressResult ?this.addressResult.province : '江苏省',
province: this.addressResult ? this.addressResult.province : '江苏省',
city: this.addressResult ? this.addressResult.city : '南京市',
district: this.addressResult ? this.addressResult.district : '玄武区'
}
@ -683,9 +684,20 @@
})
.catch()
},
findItemById(items, id) {
return items.find(item => item.goods_id == id);
},
setPirce() {
console.log(this.$refs.setRange)
let item = this.findItemById(this.goods.skuList, this.goods.goods_id)
if (item) {
this.$refs.setRange.startTime = item.sec_start_time;
this.$refs.setRange.sec_hour = item.sec_hour
this.$refs.setRange.secondPrice = item.seckill_price
this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false
this.$refs.setRange.quotaNum = item.limit_times
}
this.$refs.setRange.afterSale = true;
},
//
getCartTotal() {
@ -969,8 +981,10 @@
info.content = info.content
.replace(/style=""/g, '')
.replace(/<img " src=/g, '<img src=')
.replace(/<img src=/g, '<img style="width: 100%; display:inline-block;height:auto" src=')
info.content=info.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
.replace(/<img src=/g,
'<img style="width: 100%; display:inline-block;height:auto" src=')
info.content = info.content.replace(/\<img/gi,
'<img style="max-width:100%;height:auto" ');
info.contentLink = that.getValueAfterSymbol(that.getLinksFromRichText(info
.content), 'client://')
info.isLink = that.containsLetterMix(info.contentLink, 'http') ? true : false
@ -1043,11 +1057,11 @@
})
return;
}
if(this.userInfo.user_type == 30){
if (this.userInfo.user_type == 30) {
uni.navigateTo({
url: '/pages/member/index?type=fx'
})
}else{
} else {
uni.navigateTo({
url: '/pages/member/index1?type=hy'
})
@ -1114,8 +1128,9 @@
page_url: `pages/goods/detail?${params}`,
page_title: that.goods.goods_name
})
if(res.data.url){
let str = `型号:${that.goods.goods_name}\n前台价:¥${that.goods.goods_price_max}\n推广价:¥${that.goods.goods_price_min}\nSKU:${that.goods.goods_no}\n小程序链接:${res.data.url}`
if (res.data.url) {
let str =
`型号:${that.goods.goods_name}\n前台价:¥${that.goods.goods_price_max}\n推广价:¥${that.goods.goods_price_min}\nSKU:${that.goods.goods_no}\n小程序链接:${res.data.url}`
uni.setClipboardData({
data: str, // value
success: function() {
@ -1127,20 +1142,20 @@
})
}
})
}else{
} else {
uni.showToast({
title: '复制失败',
icon: 'none',
duration: 2000
})
}
},
toHaibao(index) {
this.shareCancel();
if (index == 2) {
this.toQueryShortUrl();
} else {
this.openDialog = false
this.showGoodsPosterPopup = true;
@ -1411,7 +1426,8 @@
display: flex;
align-items: center;
justify-content: center;
float:right;
float: right;
image {
width: 38rpx;
height: 38rpx;
@ -2306,7 +2322,8 @@
text-align: center;
margin-right: 12rpx;
}
.detail-content{
.detail-content {
overflow: hidden;
}
</style>
</style>

@ -109,10 +109,10 @@
</view>
</view>
<view v-else>
<u-waterfall v-model="list.data" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="goods-item goods-item1" v-for="(item, index) in leftList" :key="index"
@click="onTargetDetail(item)">
<!-- <u-waterfall v-model="list.data" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="goods-item goods-item1" v-for="(item, index) in list.data" :key="index"
@click="onTargetDetail(item.goods_id)">
<!-- 多列显示 -->
<view class="">
<!-- 商品图片 -->
@ -165,23 +165,19 @@
</view>
</view>
</view>
</template>
<template v-slot:right="{rightList}">
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="goods-item goods-item1" v-for="(item, index) in rightList" :key="index"
@click="onTargetDetail(item)">
<!-- 多列显示 -->
<view class="">
<!-- 商品图片 -->
<view class="goods-image">
<image class="image" mode="aspectFill" :src="item.goods_image"></image>
<!-- <u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load> -->
<u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load>
</view>
<view class="detail" style="padding-top: 10rpx;">
<!-- 商品名称 -->
<view class="goods-name">
<text>{{ item.goods_name }}</text>
</view>
<!-- 商品价格 -->
<view class="shenBox">
<view class="detail-price oneline-hide">
<text class="goods-price f-30 col-m"><text
@ -194,12 +190,12 @@
mode="">
</image>
</view>
<!-- <view class="goodsInfo" v-if="item.cmmdty_model">
<view class="goodsInfo" v-if="item.cmmdty_model">
<view class="oneTip">
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
</view>
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -217,15 +213,15 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
</view>
<view style="margin-top: 250rpx;" v-if=" total == 0">
<u-empty text="暂无数据显示哦~" mode="list"></u-empty>
<u-empty text="暂无数据显示哦~" mode="list" style="width: 100%"></u-empty>
</view>
</view>
</mescroll-body>
@ -330,7 +326,7 @@
multiChange(e) {
this.multiIndex = Number(e.detail.value)
//
this.$refs.uWaterfall1.clear();
// this.$refs.uWaterfall1.clear();
this.list.data = []
this.list = []
//this.list = getEmptyPaginateObj()
@ -351,7 +347,7 @@
if (this.options.categoryId) {
that.onChage(that.tabbar[0], 1, 0)
} else {
this.$refs.uWaterfall1.clear();
// this.$refs.uWaterfall1.clear();
this.list.data = []
this.list = []
this.mescroll.resetUpScroll()
@ -393,7 +389,7 @@
this.keyName2 = item.name
}
}
this.$refs.uWaterfall1.clear();
// this.$refs.uWaterfall1.clear();
this.list.data = []
this.list = []
this.mescroll.resetUpScroll()
@ -485,7 +481,7 @@
if (newSortType != 'city') {
const newSortPrice = newSortType === 'price' ? !app.sortPrice : true
app.sortPrice = newSortPrice
app.$refs.uWaterfall1.clear();
// app.$refs.uWaterfall1.clear();
app.list.data = []
app.list = []
app.mescroll.resetUpScroll()
@ -753,6 +749,11 @@
//
.goods-list.column-2 {
>view {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.goods-item {
// width: 50%;
}
@ -765,7 +766,7 @@
.goods-item {
background: #FFFFFF;
box-sizing: border-box;
margin: 20rpx 14rpx 0rpx 0;
margin: 20rpx 0 0rpx 0;
border-radius: 8rpx;
@ -1044,4 +1045,4 @@
}
}
</style>
</style>

File diff suppressed because it is too large Load Diff

@ -83,7 +83,7 @@
<image :src="`${$picUrl}/static/index/new${styleIndex || ''}.png?t=${timestamp}`" class="firstBg" :class="{ 'firstBgStyle': styleIndex }"></image>
<view class="firstInfo">
<view class="fTitle">
<image :src="$picUrl+'/static/index/xinren.png'" class="firstTitle"></image>
<image :src="$picUrl+'/static/index/xinren.png?t='+timestamp" class="firstTitle"></image>
<!-- <text></text> -->
</view>
<view class="couponInfo">
@ -115,9 +115,9 @@
<!-- <image src="/static/index/dapaibg.png" mode="widthFix" class="dapaibg"></image> -->
<view class="dapaiBox">
<view class="dapaiTitle">
<image :src="$picUrl+'/static/index/dapai.png'" mode="widthFix"></image>
<image :src="$picUrl+'/static/index/dapai.png?t='+timestamp" mode="widthFix"></image>
<view class="goods">
<image :src="$picUrl+'/static/index/diannei.png'" mode="widthFix"></image>
<image :src="$picUrl+'/static/index/diannei.png?t='+timestamp" mode="widthFix"></image>
<view>店内现货</view>
</view>
</view>
@ -175,7 +175,7 @@
</view>
<view class="price">
<view class="tip">
<image :src="$picUrl+'/static/index/tip.png'"></image>
<image :src="$picUrl+'/static/index/tip.png?t='+timestamp"></image>
<view class="tipPrice">
<text style="font-size: 20rpx;"></text>
<text>{{item.seckill_price_min}}</text>
@ -197,7 +197,7 @@
<!-- <view class="rightContent"> -->
<view class="rightItem1" v-if="wxAppSetting.new_product">
<view style="">
<image :src="$picUrl+'/static/index/xinpin.png'" mode="widthFix" @click="goNewGoods"
<image :src="$picUrl+'/static/index/xinpin.png?t='+timestamp" mode="widthFix" @click="goNewGoods"
class="title"></image>
<view class="more" @click="goNewGoods">查看更多<u-icon name="arrow-right"></u-icon>
</view>
@ -208,7 +208,7 @@
@click="goJump('/pages/goods/detail?goodsId=' + item.goods_id)">
<image :src="item.goods_image"></image>
<view class="priceBox">
<image :src="$picUrl+'/static/index/price.png'" mode="heightFix">
<image :src="$picUrl+'/static/index/price.png?t='+timestamp" mode="heightFix">
</image>
<view><text></text>{{item.goods_price_min}}</view>
</view>
@ -220,7 +220,7 @@
</view>
<view class="rightItem2" v-if="wxAppSetting.ranking_list">
<view style="margin-bottom: 10rpx;">
<image :src="$picUrl+'/static/index/paihangbang.png'" mode="widthFix" @click="rankIng"
<image :src="$picUrl+'/static/index/paihangbang.png?t='+timestamp" mode="widthFix" @click="rankIng"
class="title"></image>
<view class="more" @click="rankIng">查看更多<u-icon name="arrow-right"></u-icon>
</view>
@ -230,7 +230,7 @@
@click="goJump('/pages/goods/detail?goodsId=' + item.goods_id)">
<image :src="item.goods_image"></image>
<view class="priceBox">
<image :src="$picUrl+'/static/index/price.png'" mode="heightFix">
<image :src="$picUrl+'/static/index/price.png?t='+timestamp" mode="heightFix">
</image>
<view><text></text>{{item.goods_price_min}}</view>
</view>
@ -244,9 +244,9 @@
</view>
</view>
<view class="goodsRecommend">
<u-waterfall v-model="goodsRecommend" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="goodsItem" v-for="(item,index) in leftList" @click="goDetails(item)"
<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goDetails(item)"
:key="index">
<view class="pic">
<image :src="item.goods_image" mode="aspectFill"></image>
@ -294,8 +294,8 @@
</view>
</view> -->
</view>
</template>
<template v-slot:right="{rightList}">
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
@click="goDetails(item)" :key="index">
<view class="pic">
@ -307,7 +307,6 @@
<text class="name">{{item.goods_name}}</text>
</view>
</view>
<!-- 商品价格 -->
<view class="shenBox">
<view class="detail-price oneline-hide">
<text class="goods-price f-30 col-m"><text
@ -319,12 +318,12 @@
<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
</image>
</view>
<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="oneTip" >
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
</view>
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -342,10 +341,10 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
<u-empty text="暂无数据显示哦~" v-if="goodsRecommend.length==0" mode="list"></u-empty>
</view>
</view>
@ -1310,6 +1309,7 @@
}
.tabs {
margin-top: 10rpx;
width: 100%;
height: 80rpx;
align-items: center;
@ -1940,6 +1940,9 @@
.goodsRecommend {
overflow: hidden;
margin-top: 20rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.goodsItem {
width: 345rpx;
@ -1948,7 +1951,7 @@
background-color: #ffffff;
padding: 20rpx;
box-sizing: border-box;
margin: 0rpx 14rpx 20rpx 0;
margin: 0rpx 0 20rpx 0;
.pic {
width: 100%;

@ -1,322 +1,391 @@
<template>
<view class="login">
<view class="refund-navbar">
<u-navbar
title=""
:border-bottom="false"
:background="background"
></u-navbar>
</view>
<view class="login-hd">
<view class="a">验证码登录</view>
<view class="b">若该手机号未注册我们将自动为您注册</view>
</view>
<view class="login-bd">
<view class="a"
>+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号"
/></view>
<view class="b">
<input v-model="semCode" placeholder="请输入验证码" />
<text @click="getCode" v-if="!showCountDown">获取验证码</text>
<text v-if="showCountDown">{{ countdown }}s</text>
</view>
<view class="c" style="display: flex; align-items: center">
<u-checkbox
active-color="#FF343C"
v-model="isCheckout"
style="margin-right: -20rpx"
></u-checkbox
>同意<text @click="toTextPage(1)">用户服务协议</text><text
@click="toTextPage(2)"
>隐私政策</text
>
</view>
</view>
<view class="login-fd login-fd-on" @click="login">登录</view>
<view class="" v-if="isCheckout">
<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
</view>
<view
class=""
v-else
style="
<view class="login">
<view class="refund-navbar">
<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
</view>
<view class="login-hd">
<view class="a">验证码登录</view>
<view class="b">若该手机号未注册我们将自动为您注册</view>
</view>
<view class="login-bd">
<view class="a">+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号" /></view>
<view class="b">
<input v-model="semCode" placeholder="请输入验证码" />
<text @click="getCode" v-if="!showCountDown">获取验证码</text>
<text v-if="showCountDown">{{ countdown }}s</text>
</view>
<view class="c" style="display: flex; align-items: center">
<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
同意<text @click="toTextPage(1)">用户服务协议</text><text @click="toTextPage(2)">隐私政策</text>
</view>
</view>
<view class="login-fd login-fd-on" @click="login">登录</view>
<view class="" v-if="isCheckout">
<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
</view>
<view class="" v-else style="
font-size: 28rpx;
color: #666;
text-align: center;
margin-top: 50rpx;
"
@click="login"
>
手机号快捷登录
</view>
</view>
" @click="login">
手机号快捷登录
</view>
</view>
<view class="login-box" style="display: none;">
<view class="refund-navbar">
<u-navbar title="" :border-bottom="false" background="rgba(255, 233, 240, 1)"></u-navbar>
</view>
<view class="login-logo">
<image src="../../static/login_logo.png" mode=""></image>
</view>
<view class="login-name">
京苏云商
</view>
<view class="c">
<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
同意<text @click="toTextPage(1)">用户服务协议</text><text @click="toTextPage(2)">隐私政策</text>
</view>
<view class="fd fd-on" @click="login">登录</view>
</view>
</template>
<script>
import * as UserApi from "@/api/user";
import * as CaptchaApi from "@/api/captcha";
import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
import store from "@/store";
import { isEmpty } from "@/utils/util";
import { getSceneData } from '@/core/app'
export default {
components: {
mpWeiXinMobile,
},
data() {
return {
isCheckout: false,
showCountDown: false,
currentIndex: 0,
background: {
background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
backgroundSize: "100% auto",
},
phoneNum: "",
semCode: "",
countdown: 60,
countDownFun: null,
code: "",
refereeId: "",
};
},
onLoad(o) {
//
const scene = getSceneData(o)
// ID
const refereeId = scene.refereeId ? scene.refereeId : (scene.uid?scene.uid:o.refereeId)
this.refereeId = refereeId;
console.log(scene)
console.log(o)
console.log(scene.refereeId)
console.log("refereeId",refereeId)
console.log(this.refereeId)
},
methods: {
toTextPage(n) {
uni.navigateTo({
url: "/pages/news1/text?pageFlag=" + n,
});
},
validatePhoneNumber(phone) {
//
var regExp = /^1[3456789]\d{9}$/;
import * as UserApi from "@/api/user";
import * as CaptchaApi from "@/api/captcha";
import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
import store from "@/store";
import {
isEmpty
} from "@/utils/util";
import {
getSceneData
} from '@/core/app'
export default {
components: {
mpWeiXinMobile,
},
data() {
return {
isCheckout: false,
showCountDown: false,
currentIndex: 0,
background: {
background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
backgroundSize: "100% auto",
},
phoneNum: "",
semCode: "",
countdown: 60,
countDownFun: null,
code: "",
refereeId: "",
};
},
onLoad(o) {
//
const scene = getSceneData(o)
// ID
const refereeId = scene.refereeId ? scene.refereeId : (scene.uid ? scene.uid : o.refereeId)
this.refereeId = refereeId;
console.log(scene)
console.log(o)
console.log(scene.refereeId)
console.log("refereeId", refereeId)
console.log(this.refereeId)
},
methods: {
toTextPage(n) {
uni.navigateTo({
url: "/pages/news1/text?pageFlag=" + n,
});
},
validatePhoneNumber(phone) {
//
var regExp = /^1[3456789]\d{9}$/;
if (regExp.test(phone)) {
return true; //
} else {
return false; //
}
},
getCode() {
//
const that = this;
if (that.isCheckout == false) {
that.$toast("请勾选用户协议");
return;
}
if (!that.validatePhoneNumber(that.phoneNum)) {
uni.showToast({
title: "请输入正确的手机号",
});
return;
}
that.showCountDown = !that.showCountDown;
CaptchaApi.sendSmsCaptcha({
mobile: that.phoneNum
}).then((res) => {
if (res.status == 200) {
that.countDownFun = setInterval(() => {
if (that.countdown >= 1) {
that.countdown = that.countdown - 1;
} else {
that.showCountDown = false;
that.countdown = 60;
clearInterval(that.countDownFun);
}
}, 1000);
uni.showToast({
icon:"none",
title: res.message,
});
} else {
uni.showToast({
icon:"none",
title: res.message,
});
}
});
},
login() {
let that = this;
if (that.isCheckout == false) {
that.$toast("请勾选用户协议");
return;
}
//
if (!that.validatePhoneNumber(that.phoneNum)) {
that.$toast("请输入正确的手机号");
return;
}
if (that.semCode == "") {
that.$toast("请输入验证码");
return;
}
uni.login({
provider: "weixin",
success: function (res) {
store
.dispatch("Login", {
smsCode: that.semCode,
mobile: that.phoneNum,
refereeId: that.refereeId,
isParty: false,
partyData: {},
ucode: res.code
})
.then((res) => {
uni.setStorageSync("token", res.data.token);
that.$toast(res.message);
that.getUserInfo();
setTimeout(() => that.onNavigateBack(1), 2000);
});
},
fail:function(){
store
.dispatch("Login", {
smsCode: that.semCode,
mobile: that.phoneNum,
refereeId: that.refereeId,
isParty: false,
partyData: {},
// ucode: res.code
})
.then((res) => {
uni.setStorageSync("token", res.data.token);
that.$toast(res.message);
that.getUserInfo();
setTimeout(() => that.onNavigateBack(1), 2000);
});
}
});
},
getUserInfo() {
UserApi.info().then((result) => {
uni.setStorageSync("userInfo", result.data.userInfo);
});
},
onNavigateBack(delta = 1) {
//
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({
delta: Number(delta || 1),
});
} else {
this.$navTo("pages/index/index");
}
},
},
};
if (regExp.test(phone)) {
return true; //
} else {
return false; //
}
},
getCode() {
//
const that = this;
if (that.isCheckout == false) {
that.$toast("请勾选用户协议");
return;
}
if (!that.validatePhoneNumber(that.phoneNum)) {
uni.showToast({
title: "请输入正确的手机号",
});
return;
}
that.showCountDown = !that.showCountDown;
CaptchaApi.sendSmsCaptcha({
mobile: that.phoneNum
}).then((res) => {
if (res.status == 200) {
that.countDownFun = setInterval(() => {
if (that.countdown >= 1) {
that.countdown = that.countdown - 1;
} else {
that.showCountDown = false;
that.countdown = 60;
clearInterval(that.countDownFun);
}
}, 1000);
uni.showToast({
icon: "none",
title: res.message,
});
} else {
uni.showToast({
icon: "none",
title: res.message,
});
}
});
},
login() {
let that = this;
if (that.isCheckout == false) {
that.$toast("请勾选用户协议");
return;
}
//
if (!that.validatePhoneNumber(that.phoneNum)) {
that.$toast("请输入正确的手机号");
return;
}
if (that.semCode == "") {
that.$toast("请输入验证码");
return;
}
uni.login({
provider: "weixin",
success: function(res) {
store
.dispatch("Login", {
smsCode: that.semCode,
mobile: that.phoneNum,
refereeId: that.refereeId,
isParty: false,
partyData: {},
ucode: res.code
})
.then((res) => {
uni.setStorageSync("token", res.data.token);
that.$toast(res.message);
that.getUserInfo();
setTimeout(() => that.onNavigateBack(1), 2000);
});
},
fail: function() {
store
.dispatch("Login", {
smsCode: that.semCode,
mobile: that.phoneNum,
refereeId: that.refereeId,
isParty: false,
partyData: {},
// ucode: res.code
})
.then((res) => {
uni.setStorageSync("token", res.data.token);
that.$toast(res.message);
that.getUserInfo();
setTimeout(() => that.onNavigateBack(1), 2000);
});
}
});
},
getUserInfo() {
UserApi.info().then((result) => {
uni.setStorageSync("userInfo", result.data.userInfo);
});
},
onNavigateBack(delta = 1) {
//
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({
delta: Number(delta || 1),
});
} else {
this.$navTo("pages/index/index");
}
},
},
};
</script>
<style lang="scss" scoped>
.login {
width: 100%;
background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png)
center top no-repeat;
background-size: 100% auto;
min-height: 100vh;
.login-box {
width: 100%;
background: linear-gradient(180deg, rgba(255, 233, 240, 1) 0%, rgba(226, 244, 243, 0) 35%);
min-height: 100vh;
&-hd {
padding: 90rpx 75rpx 75rpx;
overflow: hidden;
.login-logo {
margin: 365rpx auto 0 auto;
width: 132rpx;
height: 132rpx;
border-radius: 24rpx;
background: rgba(243, 74, 64, 1);
box-shadow: -4rpx -8rpx 20rpx rgba(243, 74, 64, 0.16);
.a {
line-height: 80rpx;
font-size: 40rpx;
font-weight: 500;
color: #000000;
}
image {
width: 75rpx;
height: 85rpx;
margin: 23.5rpx 0 0 28.5rpx;
}
}
.b {
font-size: 28rpx;
font-weight: 400;
color: #5a5a5a;
line-height: 50rpx;
}
}
.login-name {
width: 100%;
text-align: center;
&-bd {
padding: 0 75rpx;
overflow: hidden;
font-weight: bold;
font-size: 36rpx;
color: rgba(243, 74, 64, 1);
margin-top: 22rpx;
}
.a {
padding: 20rpx 0;
border-bottom: 1px solid #f2f2f2;
display: flex;
align-items: center;
font-size: 32rpx;
font-weight: 400;
color: #212121;
.c {
justify-content: center;
padding: 28rpx 0;
font-size: 26rpx;
font-weight: 400;
color: #a0a0a0;
display: flex;
align-items: center;
input {
flex: 1;
margin-left: 30rpx;
line-height: 50rpx;
border-left: 1px solid #c4c4c4;
padding-left: 30rpx;
font-size: 28rpx;
color: #212121;
}
}
text {
color: #ff343c;
}
.b {
padding: 30rpx 0;
border-bottom: 1px solid #f2f2f2;
display: flex;
align-items: center;
font-size: 28rpx;
font-weight: 400;
color: #f3202a;
::v-deep .u-checkbox__icon-wrap--square {
border-radius: 50% !important;
width: 17px !important;
height: 17px !important;
}
}
input {
flex: 1;
margin-right: 30rpx;
line-height: 50rpx;
font-size: 28rpx;
color: #212121;
}
}
.fd {
width: 680rpx;
line-height: 88rpx;
background: rgba(243, 74, 64, 1);
border-radius: 88rpx;
text-align: center;
margin: 0 auto;
margin-top: 50rpx;
font-size: 28rpx;
font-weight: 600;
color: #ffffff;
.fd-on {
background-color: rgba(243, 74, 64, 1);
}
}
}
.c {
padding: 28rpx 0;
font-size: 28rpx;
font-weight: 400;
color: #a0a0a0;
.login {
width: 100%;
background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat;
background-size: 100% auto;
min-height: 100vh;
text {
color: #ff343c;
}
}
}
&-hd {
padding: 90rpx 75rpx 75rpx;
overflow: hidden;
&-fd {
width: 680rpx;
line-height: 88rpx;
background: #ffbdba;
border-radius: 88rpx;
text-align: center;
margin: 0 auto;
margin-top: 120rpx;
font-size: 28rpx;
font-weight: 600;
color: #ffffff;
.a {
line-height: 80rpx;
font-size: 40rpx;
font-weight: 500;
color: #000000;
}
.b {
font-size: 28rpx;
font-weight: 400;
color: #5a5a5a;
line-height: 50rpx;
}
}
&-on {
background-color: #ff343c;
}
}
}
</style>
&-bd {
padding: 0 75rpx;
overflow: hidden;
.a {
padding: 20rpx 0;
border-bottom: 1px solid #f2f2f2;
display: flex;
align-items: center;
font-size: 32rpx;
font-weight: 400;
color: #212121;
input {
flex: 1;
margin-left: 30rpx;
line-height: 50rpx;
border-left: 1px solid #c4c4c4;
padding-left: 30rpx;
font-size: 28rpx;
color: #212121;
}
}
.b {
padding: 30rpx 0;
border-bottom: 1px solid #f2f2f2;
display: flex;
align-items: center;
font-size: 28rpx;
font-weight: 400;
color: #f3202a;
input {
flex: 1;
margin-right: 30rpx;
line-height: 50rpx;
font-size: 28rpx;
color: #212121;
}
}
.c {
padding: 28rpx 0;
font-size: 28rpx;
font-weight: 400;
color: #a0a0a0;
text {
color: #ff343c;
}
}
}
&-fd {
width: 680rpx;
line-height: 88rpx;
background: #ffbdba;
border-radius: 88rpx;
text-align: center;
margin: 0 auto;
margin-top: 120rpx;
font-size: 28rpx;
font-weight: 600;
color: #ffffff;
&-on {
background-color: #ff343c;
}
}
}
</style>

@ -13,7 +13,9 @@
<view class="b">{{cityInfo.phone}}<image :src="$picUrl+'/static/news/tel.png'" @click="callPhone()"></image></view>
</view>
<view class="park-fd">
<image :src="cityInfo.wechat" show-menu-by-longpress='1'></image>
<!-- <image :src="cityInfo.wechat" show-menu-by-longpress='1'></image> -->
<!-- -->
<image mode="widthFix" :src="cityInfo.wechat" show-menu-by-longpress='true'></image>
<view class="txt">长按识别二维码</view>
<view class="txt">添加我的微信</view>
</view>
@ -141,15 +143,16 @@
text-align: center;
image{
width: 300rpx;
height: 300rpx;
// height: 300rpx;
display: block;
margin: 0 auto;
max-height:400rpx ;
}
.txt{
font-size: 32rpx;
font-weight: 400;
color: #686868;
margin-top: 20rpx;
margin-top: 30rpx;
}
}
&-btn{

@ -58,6 +58,9 @@
</script>
<style lang="scss" scoped>
::v-deep .u-empty {
padding: 100rpx 0;
}
.recharge {
padding: 25rpx;
overflow: hidden;

@ -1,7 +1,11 @@
<template>
<view class="jinqun" :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}" style="background-size: 100% 100%;text-align: center;">
<image :src="cityInfo.group_share_img" style="padding-top: 70%; width: 370rpx;height: 370rpx;" show-menu-by-longpress='1' bindtap="clickImg"></image>
</view>
<view class="jinqun" :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}"
style="background-size: 100% 100%;text-align: center;">
<view class="image-box">
<!-- mode="heightFix" -->
<image :src="cityInfo.group_share_img" show-menu-by-longpress='true' class="image" bindtap="clickImg"></image>
</view>
</view>
</template>
<script>
@ -26,7 +30,7 @@
this.cityInfo = data
}
},
clickImg(){
clickImg() {
this.onShareAppMessage()
}
},
@ -34,153 +38,184 @@
* 分享当前页面
*/
onShareAppMessage() {
return {
title: "进社群领取更多福利",
imageUrl: this.cityInfo.group_share_img
}
return {
title: "进社群领取更多福利",
imageUrl: this.cityInfo.group_share_img
}
},
/**
* 分享到朋友圈
* 本接口为 Beta 版本暂只在 Android 平台支持详见分享到朋友圈 (Beta)
* https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share-timeline.html
*/
onShareTimeline() {
return {
title: "进社群领取更多福利",
imageUrl: this.cityInfo.group_share_img
}
return {
title: "进社群领取更多福利",
imageUrl: this.cityInfo.group_share_img
}
}
}
</script>
<style>
page {
width: 100% !important;
height: 100%;
background-color: #E2b257;
}
</style>
<style lang="scss" scoped>
.jinqun{
height:100%;
position: relative;
background-repeat: no-repeat;
background-size: cover;
min-height: 100vh;
.flag{
position: absolute;
top:0;
left:0;
.flagContent{
position: relative;
display: flex;
align-items: center;
justify-content: center;
image{
width: 96px;
height:auto;
.jinqun {
.image-box {
overflow: hidden;
width: 335rpx;
height: 335rpx;
margin: 485rpx auto 0 auto;
.image {
width: 100%;
height: 100%;
}
text{
position: absolute;
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #E92214;
}
}
}
.topicText{
font-size: 80upx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
text-align: center;
background: linear-gradient(180deg, #FFFFFF 0%, #FAE0BC 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
padding-top:150upx;
}
.subTopicText{
font-size: 50upx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
color: #FFFFFF;
text-align: center;
-webkit-background-clip: text;
// -webkit-text-fill-color: transparent;
margin-top:20upx;
}
.qcode{
width: 400upx;
height:300upx;
margin:160upx auto;
border:1px solid red;
image{
width: 100%;
height: 140%;
}
}
.submitBtn{
width: 340upx;
height: 90upx;
background: linear-gradient(180deg, #FEE6A8 0%, #FCC96E 100%);
border-radius: 39px 39px 39px 39px;
opacity: 1;
font-size: 40upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #E92214;
line-height: 90upx;
text-align: center;
margin:0 auto;
position: relative;
button{
width: 100%;
height: 100%;
overflow: hidden;
height:100%;
// position: relative;
background-repeat: no-repeat;
background-size: cover;
height: 1325rpx;
.flag {
position: absolute;
left: 0;
top: 0;
z-index: 2;
opacity: 0;
}
}
.fuli{
margin: 60upx;
background-color: #fff;
border-radius: 14upx;
.fuliTitle{
width: 137px;
height: 35px;
background: #3A393E;
opacity: 1;
margin: 0 auto;
border-radius: 0 0 20px 20px;
color: #FFFFFF;
text-align: center;
line-height: 35px;
font-size: 32upx;
}
.fuliContent{
display: flex;
justify-content: space-around;
align-items: center;
padding:50upx 0;
.fuliItem{
left: 0;
.flagContent {
position: relative;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
image{
height:100upx;
width: auto;
image {
width: 96px;
height: auto;
}
text{
font-size: 28upx;
text {
position: absolute;
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #E92214;
margin-top:12upx;
}
}
}
.topicText {
font-size: 80upx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
text-align: center;
background: linear-gradient(180deg, #FFFFFF 0%, #FAE0BC 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
padding-top: 150upx;
}
.subTopicText {
font-size: 50upx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
color: #FFFFFF;
text-align: center;
-webkit-background-clip: text;
// -webkit-text-fill-color: transparent;
margin-top: 20upx;
}
.qcode {
width: 400upx;
height: 300upx;
margin: 160upx auto;
border: 1px solid red;
image {
width: 100%;
height: 140%;
}
}
.submitBtn {
width: 340upx;
height: 90upx;
background: linear-gradient(180deg, #FEE6A8 0%, #FCC96E 100%);
border-radius: 39px 39px 39px 39px;
opacity: 1;
font-size: 40upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #E92214;
line-height: 90upx;
text-align: center;
margin: 0 auto;
position: relative;
button {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
z-index: 2;
opacity: 0;
}
}
.fuli {
margin: 60upx;
background-color: #fff;
border-radius: 14upx;
.fuliTitle {
width: 137px;
height: 35px;
background: #3A393E;
opacity: 1;
margin: 0 auto;
border-radius: 0 0 20px 20px;
color: #FFFFFF;
text-align: center;
line-height: 35px;
font-size: 32upx;
}
.fuliContent {
display: flex;
justify-content: space-around;
align-items: center;
padding: 50upx 0;
.fuliItem {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
image {
height: 100upx;
width: auto;
}
text {
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #E92214;
margin-top: 12upx;
}
}
}
}
}
}
</style>
</style>

@ -266,11 +266,11 @@
<view v-if="menushow" class="menuarea">
<view class="menulist">
<view class="" @click="onInvoicing(order.order_id,order)"
v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value">
申请开票
</view>
<view class="" @click="onDelete(order.order_id)"
v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value">
删除订单
</view>
<view class=""
@ -283,7 +283,7 @@
</view>
<view class="footer">
<view class="meetPrice" @click="changeMenu"
v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)">
v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)">
更多
</view>
<view v-else style="color: #fff;">-</view>

@ -140,7 +140,9 @@
</view>
</view>
<view class="goodsPrice">
<text>{{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}</text>
{{mode}}
<!-- seckill_price -->
<text>{{options.mode === 'sharp'?(item.seckill_price?Number(item.seckill_price):item.seckill_price):(item.goods_price_min?Number(item.goods_price_min):item.goods_price_min)}}</text>
</view>
</view>
<view class="goodsNum">

@ -509,7 +509,7 @@
会员管理
</view>
</view>
<view class="serveIcon" v-if="userInfo.user_type == 40" @click="goJump('/pages/news1/jinqun')">
<view class="serveIcon" v-if="userInfo.user_type == 40 || userInfo.user_type == 30 || userInfo.user_type == 20" @click="goJump('/pages/news1/jinqun')">
<image :src="$picUrl+'/static/user/jq.png'" class="icons"></image>
<view class="serveInfo">
进群有礼
@ -523,9 +523,9 @@
:src="$picUrl+'/static/user/right.png'"></image>
</view>
<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
<u-waterfall v-model="suggestGoodsList" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="goodsItem" v-for="(item,index) in leftList" @click="goodsDetail(item)"
<!-- <u-waterfall v-model="suggestGoodsList" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="goodsItem" v-for="(item,index) in suggestGoodsList" @click="goodsDetail(item)"
:key="index">
<view class="pic">
<image :src="item.goods_image" mode="aspectFill"></image>
@ -568,8 +568,8 @@
</view> -->
</view>
</view>
</template>
<template v-slot:right="{rightList}">
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
@click="goodsDetail(item)" :key="index">
<view class="pic">
@ -587,12 +587,12 @@
<text
style="color: #949494;font-size: 22rpx;text-decoration: line-through;">{{item.line_price_min}}</text>
</view>
<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="goodsInfo1" v-if="item.cmmdty_model">
<view class="oneTip">
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
</view>
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -610,12 +610,12 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
</view>
</view>
@ -1295,7 +1295,8 @@
background-color: #ffffff;
padding: 20rpx;
box-sizing: border-box;
margin: 0rpx 14rpx 20rpx 0;
// margin: 0rpx 14rpx 20rpx 0;
margin: 0 0 20rpx 0;
.pic {
width: 100%;
@ -1312,10 +1313,10 @@
}
.goodsInfo {
margin-bottom: 12rpx;
height: 60rpx;
overflow: hidden;
.title {
height: 60rpx;
display: flex;
align-items: center;
margin-top: 10rpx;

@ -30,9 +30,9 @@
<view class="item" @click="tabFilter(3,7)" :class="filterIndex==3?'item-on':''">综合</view>
</view>
<scroll-view scroll-y class="l" @scrolltolower="lowerthreshold">
<u-waterfall v-model="list" ref="uWaterfall1">
<template v-slot:left="{leftList}">
<view class="item" v-for="(item,index) in leftList" :key="index"
<!-- <u-waterfall v-model="list" ref="uWaterfall1"> -->
<!-- <template v-slot:left="{leftList}"> -->
<view class="item" v-for="(item,index) in list" :key="index"
@click="goodsDetail(item.goods_id)" :isLoading="isLoading">
<image :src="item.goods_image"></image>
<view class="title">
@ -45,8 +45,8 @@
<view class="o">{{item.line_price_min?Number(item.line_price_min):''}}</view>
</view>
</view>
</template>
<template v-slot:right="{rightList}">
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
<view class="item" v-for="(item,index) in rightList" :key="index"
@click="goodsDetail(item.goods_id)" :isLoading="isLoading">
<image :src="item.goods_image"></image>
@ -60,8 +60,8 @@
<view class="o">{{item.line_price_min?Number(item.line_price_min):''}}</view>
</view>
</view>
</template>
</u-waterfall>
</template> -->
<!-- </u-waterfall> -->
<u-empty text="暂无数据显示哦~" v-if="list.length==0" mode="list"></u-empty>
<u-divider v-if="list.length == total && total>=1">没有更多了</u-divider>
</scroll-view>
@ -178,7 +178,7 @@
this.tabIndex = index;
this.page = 1;
this.list = [];
this.$refs.uWaterfall1.clear();
// this.$refs.uWaterfall1.clear();
this.category_id = (index==-1? this.categoryList[this.tabIndex1].category_id:item.category_id)
this.getBrandList(this.category_id)
},
@ -190,7 +190,7 @@
app.categoryChildren = [];
app.categoryChildren = item.children;
app.list = [];
this.$refs.uWaterfall1.clear();
// this.$refs.uWaterfall1.clear();
app.category_id = item.category_id
this.getBrandList(item.category_id)
},
@ -579,4 +579,4 @@
.goods .uni-scroll-view .uni-scroll-view {
overflow: auto !important;
}
</style>
</style>

Loading…
Cancel
Save