liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
linxi
2025-03-27 18:13:53 +08:00
parent f631166047 01c1a44a32
commit d400c2c948
25 changed files with 376 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/inn.js
+6
View File
@@ -266,5 +266,11 @@ export function shareTown(id) {
return request.get("/ancientTown/poster/" + id, {login: true})
}
/**
* 获取用户店铺列表
*/
export function getMerchantApply() {
return request.get("/merchantApply/userHotels", {}, {login: true})
}
components/CouponsPopup.vue
+2
View File
@@ -204,12 +204,14 @@ export default {
selectCoupon(id) {
this.couponId = id
this.selectItem = this.list.find(e => e.id === id) || {}
// this.$emit('select', this.selectItem)
this.list.map(item => {
item.checked = id === item.id
})
},
setCoupon() {
if (this.current === 1) return
console.log(this.current, '====1=======');
uni.setStorageSync('couponId', this.couponId)
this.$emit('change', this.selectItem || {})
this.$emit('ok', this.couponId)
components/FunctionGuide.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<view v-if="show" class="guide-remark white" @touchmove.stop.prevent="" >
<view v-if="show" class="guide-remark white" @touchmove.stop.prevent="" @click="next">
<view class="guid-wrap">
<image
v-for="(img, index) in functionGuideData.imgs"
components/ProductWindow.vue
+39 -4
View File
@@ -46,7 +46,14 @@
<view class="titlev12-dark-text f12-font-32">购买数量</view>
<view class="carnum acea-row row-left">
<view style="border-radius: 40rpx 0rpx 0rpx 40rpx" class="cart-btn item reduce v12-font-36 v12-font-bold v12-white-text v12-dark1 v12-dark1-border" :class="cartNum <= 1 ? 'on' : ''" @click="CartNumDes">-</view>
<view class="item v12-font-36 v12-font-bold v12-dark-text cart-btn">{{ cartNum }}</view>
<input
type="number"
:min="1"
:max="attrObj.productSelect.stock"
@input="inputNumer"
v-model="cartNumber"
style="height: 55rpx !important;"
class="item v12-font-36 v12-font-bold v12-dark-text cart-btn" />
<view
style="border-radius:0 40rpx 40rpx 0"
class="item plus v12-font-bold v12-white-text v12-primary v12-primary-border v12-font-36 cart-btn"
@@ -89,7 +96,7 @@ export default {
},
paddingBottom: {
type: String,
default: '140rpx'
default: '160rpx'
},
showOk: {
type: Boolean,
@@ -110,17 +117,43 @@ export default {
},
data() {
return {
cartNumber: this.cartNum,
attrObj: {
productSelect: {},
productAttr: []
}
}
},
watch: {
cartNum: {
handler(val) {
console.log(val, 'cardNum');
this.cartNumber = val || 1
},
deep: true
},
cartNumber(val) {
console.log(+val <= 1 || val === '', 'cartNumber');
if(+val <= 1 || val === '') {
this.cartNumber = 1
this.$forceUpdate()
this.$emit('input', 1)
this.$emit("changeFun", { action: "ChangeCartNum", value: 1 })
return
} else {
this.$emit('input', +val)
this.$emit("changeFun", { action: "ChangeCartNum", value: +val })
}
}
},
created() {
this.$set(this, 'attrObj', JSON.parse(JSON.stringify(this.attr)))
console.log(this.attrObj)
},
methods: {
inputNumer(e) {
},
reRender(data) {
this.$set(this, 'attrObj', JSON.parse(JSON.stringify(data)))
// console.log(this.attrObj.productAttr)
@@ -135,10 +168,12 @@ export default {
this.$emit("changeFun", { action: "changeattr", value: false })
},
CartNumDes() {
this.$emit("changeFun", { action: "ChangeCartNum", value: false })
this.cartNumber--
this.$emit("changeFun", { action: "ChangeCartNum", value: this.cartNumber })
},
CartNumAdd() {
this.$emit("changeFun", { action: "ChangeCartNum", value: 1 })
this.cartNumber++
this.$emit("changeFun", { action: "ChangeCartNum", value: this.cartNumber })
},
tapAttr(index, subIndex, subItem) {
// 缺货的点击了没效果
components/tm-upload/tm-upload.vue
+4 -4
View File
@@ -139,10 +139,10 @@ export default {
}
},
videoError(e) {
uni.showModal({
content: '网络错误，请稍后重试！',
showCancel: false
});
// uni.showModal({
// content: '网络错误，请稍后重试！',
// showCancel: false
// });
},
uploadFile(paths) {
const promises = paths.map((path) => {
components/tpf-time-range/tpf-time-range.vue
+4
View File
@@ -113,6 +113,10 @@ export default{
this.$refs.popup.open();
},
closePopup(action=""){
if(action == "cancel"){
this.$refs.popup.close();
return false;
}
if(this.compareTwoTimeRange(this.startDefaultTimeArr , this.endDefaultTimeArr)){
uni.showToast({
title:"开始时间不能大于结束时间",
mixins/goCartMixins.js
+6 -2
View File
@@ -276,7 +276,11 @@ export default {
let stock = productSelect.stock || 0
let num = this.attr.productSelect
if (changeValue) {
num.cart_num++
if(changeValue > 1) {
num.cart_num = changeValue
} else {
num.cart_num++
}
if (num.cart_num > stock) {
if(stock < 1) {
this.$set(this.attr.productSelect, 'cart_num', 1)
@@ -291,7 +295,7 @@ export default {
this.$set(this, 'cart_num', 1)
} else {
this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
this.$set(this, 'cart_num', num.cart_num)
// this.$set(this, 'cart_num', num.cart_num)
}
}
} else {
pages/chose-city/chose-city.vue
+1
View File
@@ -383,6 +383,7 @@ export default {
this.mescroll && this.mescroll.triggerDownScroll()
},
search() {
if(this.keyword === '') return
this.listGroup.findIndex((group, index) => {
let result
group.city.forEach(item => {
pages/home/index.vue
+1 -1
View File
@@ -28,7 +28,7 @@
:text="recommendKeyword"
:icon="' '"
color="#333"
fontSize="12"
fontSize="14"
bgColor="transparent"
@change="changeRecommendKeyword"
direction="column">
pages/order/MyOrder/index.vue
+1 -2
View File
@@ -476,9 +476,8 @@ export default {
this.changeType(this.type);
},
tabChange(item) {
this.type = item.index
this.$yroute.query.type = this.type
this.changeType();
},
changeType() {
pages/order/OrderDetails/index.vue
+10 -2
View File
@@ -111,7 +111,7 @@
<view style="margin-top: 30rpx;border-radius:20rpx;overflow: hidden;" class="v12-white">
<!-- <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []" title="商品信息"></OrderGoods> -->
<view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in orderInfo.cartInfo" :key="d">
<view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in orderInfo.cartInfo" :key="d" @click="goGoodsCon(cart)">
<view class="v12-justify-between">
<view class="">
<image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="cart.productInfo.image"></image>
@@ -136,7 +136,7 @@
</view>
</view>
</view>
<view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)">
<view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)">
<view class="v12-justify-between v12-mt-3 v12-dark-text">
<view class="v12-font-24 v12-dark-text">
商品总价
@@ -546,6 +546,14 @@ export default {
},
methods: {
copyClipboard,
goGoodsCon(item) {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: {
id: item.productId
}
})
},
handleShowMore() {
this.showMoreDeliver = !this.showMoreDeliver;
},
pages/order/OrderSubmission/index.vue
+3 -1
View File
@@ -388,7 +388,8 @@ export default {
this.computedPrice('shipping_type');
},
async couponId(value) {
this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === value)
this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === +value)
this.couponTitle = this.couponList['usable']?.[this.couponIndex]?.couponTitle
await this.computedPrice('couponId')
}
},
@@ -438,6 +439,7 @@ export default {
methods: {
isNullOrEmpty,
couponMax(e) {
console.log(e, 'dxdhkasjhdajks');
this.couponTitle = e.couponTitle
this.couponId = this.$yroute.query.couponId || uni.getStorageSync('couponId') || 0
},
pages/shop/GoodSearch/index.vue
+46 -11
View File
@@ -19,7 +19,15 @@
<text>搜索</text>
</button>
<view class="swpier-bar" v-if="showkey">
<u-notice-bar duration="4000" @change="change" :text="recommendKeyword" :icon="' '" color="#999" fontSize="12" bgColor="transparent" direction="column"></u-notice-bar>
<u-notice-bar
duration="4000"
@change="change"
:text="recommendKeyword"
:icon="' '"
color="#999"
fontSize="14"
bgColor="transparent"
direction="column"></u-notice-bar>
</view>
</view>
<view @click="goShoppingCart()" class="item animated bounceIn">
@@ -44,7 +52,7 @@
<view
v-for="item of historyKey"
:key="item.id"
class="item one-t"
class="item one-t v12-font-28"
@click="toSearch(item.word)"
>
{{ item.word }}
@@ -55,12 +63,20 @@
<view class="title">热门搜索</view>
<view class="list acea-row">
<view
v-for="keywordsKey of keywords"
:key="keywordsKey"
class="item"
@click="toSearch(keywordsKey)"
v-for="(hot, key) in keywords"
:key="key"
class="item v12-font-28 v12-align-center"
:style="{paddingRight: hot.isNew === 1 ? '0 !important' : '24rpx !important'}"
@click="toSearch(hot.keyword)"
>
{{ keywordsKey }}
<view v-if="hot.isNew === 2">
<image :src="webUrl + '/icon/fire.png'" class="fire-icon"></image>
</view>
{{ hot.keyword }}
<view class="new-icon-box" v-if="hot.isNew === 1" >
<image class="new-icon" :src="webUrl + '/icon/new.png'"></image>
</view>
</view>
</view>
</view>
@@ -128,6 +144,7 @@ export default {
name: 'GoodSearch',
data: function () {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
showkey: true,
currentSearch: '',
keywords: [],
@@ -219,7 +236,7 @@ export default {
getSearchPageConfig().then(res => {
const { success, data } = res
if (success) {
this.keywords = data.hotKeyword
this.keywords = data.searchKeywords
this.rankingArr.push(data.ranking1)
this.rankingArr.push(data.ranking2)
this.recommendKeyword = data.recommendKeyword.split(',')
@@ -269,6 +286,23 @@ export default {
</script>
<style lang="less">
.new-icon-box{
position: relative;
width: 50rpx;
height: 100%;
}
.fire-icon{
width: 24rpx;
height: 24rpx;
margin-right: 5rpx;
}
.new-icon{
width: 40rpx;
height: 26rpx;
left: 10rpx;
top: -5rpx;
position: absolute;
}
.iconfont{
position: relative;
}
@@ -351,11 +385,12 @@ export default {
box-sizing: border-box;
margin: 0 24rpx 20rpx 0;
padding: 0 24rpx;
border-radius: 28rpx;
background: #F1F0EE;
color: #666;
border-radius: 12rpx;
background: #F2F2F2;
color: #333;
font-size: 24rpx;
line-height: 48rpx;
position: relative;
}
}
pages/shop/GoodsCon/index.vue
+36 -17
View File
@@ -17,13 +17,16 @@
<view>
<view class="share acea-row row-between row-middle" style="flex-wrap: nowrap;margin-top: 0;">
<view class="money font-color-lightred acea-row v12-align-center">
<view>
<view v-if="!storeInfo.isNegotiable">
<text class="v12-font-22 v12-red-text">￥</text>
<text class=" v12-primary-text v12-font-44 v12-red-text">{{ attr.productSelect.price }}</text>
<text class="v12-ml-2 v12-font-weight-300 v12-font-22" style="color: #BBBBBB; text-decoration: line-through;">￥</text>
<text class="v12-mr-2 v12-font-weight-300 v12-font-22" style="color: #BBBBBB; text-decoration: line-through;">{{ attr.productSelect.otPrice }}</text>
<text v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" class="v12-white-text v12-red v12-font-22 v12-radius-40 v12-px-1 v12-font-weight-400">会员价</text>
</view>
<view v-if="storeInfo.isNegotiable === 1" class="v12-primary-text v12-font-32 v12-font-weight" @click="goRoom">
价格面议
</view>
</view>
<view style="flex-shrink:0;" class="acea-row row-middle share-btn" @click="listenerActionSheet">
<image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
@@ -192,7 +195,13 @@
<!-- v9 优惠券开始 -->
<u-popup :show="show" :round="10" mode="bottom" closeOnClickOverlay @close="changeCoupons()">
<CouponsPopup :two-list="couponList" @ok="setCoupon" @change="changeCoupons" @close="changeCoupons()" :showTab="false" :currentPrice="storeInfo.price" />
<CouponsPopup
:two-list="couponList"
@ok="setCoupon"
@change="changeCoupons"
@close="changeCoupons()"
:showTab="false"
:currentPrice="storeInfo.price" />
</u-popup>
<!-- v9 优惠券结束 -->
@@ -402,7 +411,7 @@
<!-- 商品详情结束 -->
<!-- 购买须知开始 -->
<view class="acea-row row-column bg-white" style="padding: 20rpx;border-width: 2px;border-color: #939390;">
<view class="acea-row row-column bg-white" style="padding: 20rpx;border-width: 2px;border-color: #939390;padding-bottom: 60rpx;">
<view class="conter">
<rich-text :nodes="buyNotice" />
</view>
@@ -449,7 +458,7 @@
<view
class="btn-car v12-primary-text v12-primary-border"
:class="{
'btn-car-disabled': (attr.productSelect.stock === 0 && attr.cartAttr) || storeInfo.stock === 0
'btn-car-disabled': (attr.productSelect.stock === 0 && attr.cartAttr) || storeInfo.stock === 0 || storeInfo.isNegotiable === 1
}"
@click="joinCart"
>
@@ -458,7 +467,7 @@
<view
class="btn-buy"
:class="{
'btn-buy-disabled': (attr.productSelect.stock === 0 && attr.cartAttr) || storeInfo.stock === 0
'btn-buy-disabled': (attr.productSelect.stock === 0 && attr.cartAttr) || storeInfo.stock === 0 || storeInfo.isNegotiable === 1
}"
@click="tapBuy"
>
@@ -806,6 +815,7 @@ export default {
})
},
goRoom() {
console.log(this.systemStore);
const params = {
goodsId: this.id,
goodsName: this.attr.productSelect.store_name,
@@ -816,8 +826,9 @@ export default {
goodsData: '',
seckillData: ''
}
const name = this.storeInfo.merName
uni.navigateTo({
url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${this. systemStore.name}&params=${JSON.stringify(params)}`
url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${name}&params=${JSON.stringify(params)}`
})
},
goodsDetail(item) {
@@ -1238,7 +1249,12 @@ export default {
let stock = productSelect.stock || 0
let num = this.attr.productSelect
if (changeValue) {
num.cart_num++
console.log(changeValue);
if(changeValue > 1) {
num.cart_num = changeValue
} else {
num.cart_num++
}
if (num.cart_num > stock) {
if(stock < 1) {
this.$set(this.attr.productSelect, 'cart_num', 1)
@@ -1253,7 +1269,7 @@ export default {
this.$set(this, 'cart_num', 1)
} else {
this.$set(this.attr.productSelect, 'cart_num', num.cart_num)
this.$set(this, 'cart_num', num.cart_num)
// this.$set(this, 'cart_num', num.cart_num)
}
}
} else {
@@ -1347,7 +1363,7 @@ export default {
},
// 点击加入购物车按钮
joinCart() {
if ((this.attr.productSelect.stock === 0 && this.attr.cartAttr) || this.storeInfo.stock === 0) {
if ((this.attr.productSelect.stock === 0 && this.attr.cartAttr) || this.storeInfo.stock === 0 || this.storeInfo.isNegotiable === 1) {
return
}
// 0=加入购物车
@@ -1356,7 +1372,7 @@ export default {
},
// 立即购买
tapBuy() {
if ((this.attr.productSelect.stock === 0 && this.attr.cartAttr) || this.storeInfo.stock === 0) {
if ((this.attr.productSelect.stock === 0 && this.attr.cartAttr) || this.storeInfo.stock === 0 || this.storeInfo.isNegotiable === 1) {
return
}
// 1=直接购买
@@ -1766,12 +1782,12 @@ export default {
.btn-car {
width: 200rpx;
height: 60rpx;
line-height: 60rpx;
height: 70rpx;
line-height: 70rpx;
box-sizing: border-box;
margin-right: 20rpx;
border: 2rpx solid #FF564A;
border-radius: 30rpx;
border-radius:100rpx;
color: #FF564A;
}
@@ -1782,9 +1798,9 @@ export default {
.btn-buy {
width: 200rpx;
height: 60rpx;
line-height: 60rpx;
border-radius: 30rpx;
height: 70rpx;
line-height: 70rpx;
border-radius: 70rpx;
background: #C52733;
color: #FFFFFF;
}
@@ -2015,7 +2031,10 @@ export default {
.footer .icon-shoucang1 {
color: #eb3729;
}
.product-con .footer{
height: 140rpx !important;
padding-bottom: 20rpx;
}
.product-con .product-intro .conter view {
width: 100% !important;
}
pagesInn/components/jin-edit/homeList.vue
+102
View File
@@ -0,0 +1,102 @@
<template>
<u-popup
:show="show"
@close="close"
@open="open"
mode="center"
closeable
round="10"
>
<view class="v12-pa-3 pop-content">
<view class="v12-dark-text v12-font-bold pop-title">请选择登录的店铺</view>
<view v-for="(item, index) in list" :key="index" class="home-wrap">
<view>
<u-avatar :src="item.logo"></u-avatar>
</view>
<view class="name-wrap one-t">{{ item.name }}</view>
<view class="enter-btn" @click="queryHome(index)">
点击进入
</view>
</view>
</view>
</u-popup>
</template>
<script>
export default {
data() {
return {
list: [],
show: false,
}
},
methods: {
queryHome(e) {
this.$nextTick(() => {
this.$emit('enter', this.list[e])
uni.setStorageSync('homeId', this.list[e].id)
this.show = false
})
},
open(records) {
if(!records) return;
this.show = true;
this.list = records && [...records] || []
},
close() {
this.show = false;
}
}
}
</script>
<style lang="less" scoped>
.home-wrap{
display: flex;
align-items: center;
justify-content: space-between;
background: #F6F6F6;
padding: 10rpx 20rpx;
border-radius: 20rpx;
margin-bottom: 10rpx;
}
.name-wrap{
width: 280rpx;
font-size: 30rpx;
font-weight: bold;
}
.enter-btn{
width: 118rpx;
height: 42rpx;
background: #BD3124;
border-radius: 22rpx;
padding: 2rpx 10rpx;
text-align: center;
line-height: 42rpx;
color: #fff;
font-size: 24rpx;
}
.pop-content{
width: 568rpx;
max-height: 860rpx;
background: rgba(255,255,255,0.39);
border-radius: 12rpx;
}
.pop-title{
position: relative;
width: fit-content;
margin-bottom: 20rpx;
}
.pop-title::after{
content: '';
position: absolute;
bottom: 0rpx;
left: 0;
width: 100%;
height: 5px;
background-color: #BD3124;
border-radius: 20rpx;
opacity: 0.5;
}
</style>
pagesInn/inn/farmerStore.vue
+1 -1
View File
@@ -248,7 +248,7 @@
:show-fullscreen-btn="false"
class="video-item"
:id="'video-item' + index"
@play="infoItemViewClick(item, index)"
@click="infoItemViewClick(item, index)"
>
</video>
pagesInn/inn/innHome.vue
+42 -7
View File
@@ -401,6 +401,10 @@
<image :src="webUrl + '/page/hotel/edit.png'" class="img" />
修改资料
</view>
<view class="bottom-btn" @click="changeHome">
<image :src="webUrl + '/icon/qiehuan.png'" class="img" />
切换店铺
</view>
</view>
</view>
<goo-skeleton v-else />
@@ -431,6 +435,7 @@
/>
</view>
</u-popup>
<homeList ref="homeList" @enter="goHome"></homeList>
</view>
</template>
@@ -446,7 +451,8 @@ import {
setTopHotelNew,
getHotelNewsZan,
getHotelShareBackgroundImage,
hotelNewsView
hotelNewsView,
getMerchantApply
} from "@/api/inn.js"
import {formatDateTime} from "@/utils"
import {getUrlParam} from "@/utils/common.js"
@@ -454,14 +460,16 @@ import imgBox from '@/components/imageTypeSet/imagebox.vue'
import cookie from "@/utils/store/cookie"
import {addStore, removeStore} from "@/api/favorite"
import { pageListenMixins } from '@/mixins/pageListenMixins'
import homeList from "../components/jin-edit/homeList.vue"
export default {
components: {
imgBox
imgBox,
homeList
},
mixins: [pageListenMixins],
data() {
return {
homeList: [],
webUrl: this.$VUE_APP_RESOURCES_URL,
isLoad: false,
activeIndex: 0,
@@ -543,7 +551,7 @@ export default {
break
}
if (id) {
this.id = id || null
this.id = uni.getStorageSync('homeId') || id
this.partnerId = options.partnerId || null
} else {
let obj = uni.getEnterOptionsSync()
@@ -587,7 +595,36 @@ export default {
}
this.fetchInnDetail()
},
watch: {
activeIndex: {
handler(val) {
console.log(val);
if (val === 1) {
this.fetchInnInfoList()
}
},
deep: true,
immediate: true
}
},
methods: {
goHome(e) {
this.id = e.id
if(this.activeIndex !==1) {
this.activeInde = 1
} else {
this.fetchInnInfoList()
}
this.fetchInnDetail()
},
changeHome() {
uni.showLoading()
getMerchantApply().then(res => {
this.$refs.homeList.open(res.data || [])
}).finally(() => {
uni.hideLoading()
})
},
changeShare() {
this.showShare = !this.showShare
},
@@ -1065,11 +1102,9 @@ export default {
background: #fff;
.name {
padding: 8rpx 6rpx;
padding: 0 6rpx;
font-size: 26rpx;
line-height: 36rpx;
color: #333333;
height: 70rpx;
}
.price-line {
pkg_common/views/roomLogs.vue
+1 -1
View File
@@ -28,7 +28,7 @@
<view class="datetime" v-if="item.last_msg">{{ item.last_msg.created_at }}</view>
</view>
<view class="sub v12-align-center v12-justify-between" v-if="item.last_msg">
<view class="one-t">{{ item.last_msg.msg_type===0?item.last_msg.msg_content:'[图片]' }}</view>
<view class="one-t" style="width: 90%;">{{ item.last_msg.msg_type===0?item.last_msg.msg_content:'[图片]' }}</view>
<view v-if="item.unread_num > 0" class="unread-num v12-primary"> {{ item.unread_num < 99 ? item.unread_num : '99+' }}</view>
</view>
</view>
pkg_join/views/index.vue
+10 -5
View File
@@ -51,7 +51,8 @@ export default {
hasSupplier: null,
hasWholesaler: null,
images: null,
pageKeyId: Object.freeze('merchantApplyIndex')
pageKeyId: Object.freeze('merchantApplyIndex'),
canApplyHotel: false
}
},
onLoad(options) {
@@ -63,6 +64,7 @@ export default {
this.hasHotel = data.hasHotel
this.hasSupplier = data.hasSupplier
this.hasWholesaler = data.hasWholesaler
this.canApplyHotel = data.canApplyHotel
})
},
methods: {
@@ -83,11 +85,14 @@ export default {
}
break
case 'shop':
if (this.hasHotel === 1) {
this.$yrouter.push('/pagesInn/inn/innHome?id='+this.hotelId)
} else {
this.$yrouter.push('/pkg_join/views/shop?partnerId=' + this.partnerId)
if (!this.canApplyHotel) {
uni.showToast({ // 使用uni-app官方提示API
title: '您的店铺数量已到达上限，不能继续申请店铺',
icon: 'none'
})
return
}
this.$yrouter.push('/pkg_join/views/shop?partnerId=' + this.partnerId)
break
case 'wholesaler':
if (this.hasWholesaler === 1) {
pkg_join/views/supplier.vue
+5 -1
View File
@@ -732,6 +732,8 @@ export default {
const local = uni.getStorageSync(type) || {}
const local_form = uni.getStorageSync(type + '_form') || {}
this.quaPics = uni.getStorageSync(type + '_quaPics') || []
console.log(this.quaPics, 'this.quaPics');
if(!local_form.serviceTime) {
local_form.serviceTime = '00:00'
}
@@ -894,9 +896,11 @@ export default {
})
}
// 商家资质
this.quaPics = []
const quaPicsTemp = this.form.qualification && this.form.qualification.split(',') || []
if (quaPicsTemp.length > 0) {
console.log(quaPicsTemp, 'quaPicsTemp--------');
this.quaPics = []
quaPicsTemp.map(item => {
if (item) {
this.quaPics.push({url: item})
pkg_product/views/famousQianxianShop.vue
+4 -3
View File
@@ -844,6 +844,7 @@ export default {
scrollTop: 100,
duration: 300
})
console.log(res.top);
const imgs = [
{
url: this.webUrl + '/引导页素材/千县名品/Group 4/Group 4-1.png',
@@ -851,7 +852,7 @@ export default {
position: 'absolute',
zIndex: 99,
width: '366rpx',
top: 460*2+'rpx',
top: (res.top-180)*2+'rpx',
left: 80*2+'rpx',
height: '167rpx',
/* px: ; */
@@ -864,7 +865,7 @@ export default {
position: 'absolute',
zIndex: 99,
width: '117rpx',
top: 440*2+'rpx',
top: (res.top-200)*2+'rpx',
left: -60*2+'rpx',
right: 0,
margin: 'auto',
@@ -878,7 +879,7 @@ export default {
position: 'absolute',
zIndex: 99,
width: '117rpx',
top: 440*2+'rpx',
top: (res.top-200)*2+'rpx',
left: 200*2+'rpx',
height: '46rpx',
},
pkg_user/components/invinbg-image-cropper/invinbg-image-cropper.vue
+1 -1
View File
@@ -491,7 +491,7 @@
position: relative;
/* width: 40px; */
/* height: 40px; */
background: #fff;
/* background: #fff; */
border-radius: 20px;
padding: 10px;
display: inline-block;
pkg_user/views/gift/components/GiftCard.vue
+21 -7
View File
@@ -24,17 +24,17 @@
<u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
</button>
</view>
<view v-if="myGift.isCurrentUser === 1" @click="toOrder" style="z-index: 10">
<view v-if="myGift.isCurrentUser === 1" @click="toOrder" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view class="address-btn v12-white-text v12-primary">
您已领取礼包
</view>
<view class="v12-text-center v12-font-26 v12-primary-text v12-mt-3">查看礼包详情>></view>
<view class="info-btn v12-text-center v12-font-32 v12-mt-3">查看礼包详情>></view>
</view>
<view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10">
<view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view class="address-btn v12-white-text v12-primary">
礼包已被领取
</view>
<view class="v12-text-center v12-font-26 v12-primary-text v12-mt-3" style="z-index: 10">去商城看看>></view>
<view class="info-btn v12-text-center v12-font-32 v12-mt-3" style="z-index: 10">去商城看看>></view>
</view>
<view class="tips">
<view class="tip-text v12-mr-1" @click="showTips">
@@ -176,6 +176,18 @@ export default {
</script>
<style scoped>
.info-btn{
border: 1px solid #C52733;
color: #C52733;
width: 240rpx;
border-radius: 100rpx;
padding: 5rpx 40rpx;
line-height: 60rpx;
height: 60rpx;
font-weight: 600;
font-size: 32rpx;
white-space: nowrap;
}
.dialog-conent{
height: 100vh;
display: flex;
@@ -263,14 +275,16 @@ export default {
}
.address-btn{
width: fit-content;
padding: 10rpx 40rpx;
padding: 5rpx 40rpx;
border-radius: 100rpx;
font-size: 32rpx;
font-weight: bold;
height: 80rpx;
line-height: 80rpx;
height: 60rpx;
line-height: 60rpx;
width: 240rpx;
/* margin-top: 40rpx; */
z-index: 999;
text-align: center;
}
.gift-card-modal {
height: 704rpx;
pkg_user/views/gift/gift.vue
+14 -10
View File
@@ -60,19 +60,19 @@
v-model="goodsInfo.cartNum"
:max="goodsInfo['productInfo']['attrInfo']['stock']"
integer
disabledInput
iconStyle="color: #fff"
class="num-step"
@change="numberChange"
>
<template v-slot:minus>
<view class="v12-minus-btn v12-font-bold flex jc-center ai-center">
<u-icon name="minus" size="12" color="#FFFFFF"/>
</view>
</template>
<template v-slot:input>
<view class="num-input tc v12-num-input">{{ goodsInfo['cartNum'] }}</view>
</template>
<!-- <template v-slot:input>
<input type="number" @input="numberChange" class="num-input tc v12-num-input" v-model="goodsInfo['cartNum']" />
</template> -->
<template v-slot:plus>
<view class="v12-plus-btn v12-font-bold flex jc-center ai-center v12-primary">
<u-icon name="plus" size="12" color="#FFFFFF"/>
@@ -397,7 +397,7 @@ export default {
console.log(err);
uni.hideLoading();
uni.showToast({
title:"创建订单失败",
title:err.msg,
icon: "none",
duration: 2000
});
@@ -410,10 +410,14 @@ export default {
}
}
</script>
<style>
.gift-page .u-number-box input {
height: 40rpx !important;
}
</style>
<style lang="less" scoped>
.custom-cover{
height: 58rpx;
height: 40rpx;
}
.info-wrap{
width: 100%;
@@ -423,8 +427,8 @@ export default {
justify-content: space-between;
}
.v12-num-input{
height: 40rpx;
width: 40rpx;
height: 56rpx;
width: 56rpx;
border: 1px solid #E6E6E6;
line-height: 40rpx;
font-weight: bold;
@@ -436,8 +440,8 @@ export default {
}
.v12-minus-btn{
border-radius: 28rpx 0rpx 0rpx 28rpx;
border: 1px solid #E6E6E6;
background-color: rgba(208,208,208,0.39);
border: 1px solid rgba(208,208,208,0.39);
height: 40rpx;
width: 40rpx;
font-weight: bold;
pkg_user/views/withdrawalLog.vue
+15 -1
View File
@@ -25,9 +25,13 @@
<view style="color:#E92727;font-size: 32rpx;">￥{{ item['extractPrice'] }}</view>
</view>
</view>
</view>
<view>
<image class="empty-img" :src="webUrl + '/orderIcon/nodata1.png'" mode="heightFix" lazy-load="false">
</image>
</view>
</scroll-view>
</template>
@@ -73,12 +77,22 @@ export default {
</script>
<style scoped lang="less">
.empty-img{
width: 100%;
position: absolute;
top: 0;
bottom: 200rpx;
left: 0;
right: 0;
margin: auto;
}
view {
line-height: 1;
}
.scroll-body {
height: 100vh;
background: #fff;
}
.logs {