mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

头像点击修改

This commit is contained in:
1154079537 2024-05-23 10:22:33 +08:00
parent 0810b43ff8
commit aa3e8e8b6b
4 changed files with 49 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pages/index/index.vue
View File

@ -4,16 +4,15 @@
<view class="content-tops"> <view class="content-tops">
<view class="content-top_img" v-if="Object.keys(userInfoData).length>0"> <view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
<image :src="userInfoData.mer_info.mer_avatar" <image :src="userInfoData.mer_info.mer_avatar"
v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill" @click="byset">
@click="logout">
</image> </image>
<image src="@/static/images/f.png" v-else mode="aspectFit" @click="logout"></image> <image src="@/static/images/f.png" v-else mode="aspectFit" @click="byset"></image>
</view> </view>
<view class="content-top_img" v-else @click="login"> <view class="content-top_img" v-else @click="login">
<image src="@/static/images/f.png" mode="aspectFit"></image> <image src="@/static/images/f.png" mode="aspectFit"></image>
</view> </view>
<view v-if="Object.keys(userInfoData).length>0"> <view v-if="Object.keys(userInfoData).length>0">
<view class="content-top-title" @click="shopp" v-if="Object.keys(userInfoData).length>0"> <view class="content-top-title" @click="byset" v-if="Object.keys(userInfoData).length>0">
<view class="top-titlea"> <view class="top-titlea">
{{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}} {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}}
</view> </view>
@ -871,8 +870,7 @@
}, 10) }, 10)
} }
}, },
onReady() { onReady() {},
},
onShow() { onShow() {
if (this.loadEndFlag) { if (this.loadEndFlag) {
@ -1130,7 +1128,6 @@
}, },
//关闭弹窗 //关闭弹窗
recuo() { recuo() {
if (this.num > 0) { if (this.num > 0) {
this.num = 15 this.num = 15
this.isFshow = false this.isFshow = false
@ -1259,6 +1256,11 @@
//商家设置 //商家设置
byset() { byset() {
// #ifdef H5
this.$refs.popup1.open()
// #endif
// #ifndef H5
if (this.userid) { if (this.userid) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/product/basicSet?mer_id=' + this.userInfoData.service.mer_id url: '/pages/product/basicSet?mer_id=' + this.userInfoData.service.mer_id
@ -1267,6 +1269,7 @@
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
} }
// #endif
}, },
//个人详情 //个人详情

45
pages/product/addGoodDetail/addGoodDetail.vue
View File

@ -288,7 +288,6 @@
productCreate, productCreate,
productUpdate, productUpdate,
productDetail productDetail
} from '@/api/product.js'; } from '@/api/product.js';
import uploadImgVideo from "../addGood/components/uploadImgVideo.vue" import uploadImgVideo from "../addGood/components/uploadImgVideo.vue"
import form from "../../../uni_modules/uview-ui/libs/config/props/form"; import form from "../../../uni_modules/uview-ui/libs/config/props/form";
@ -318,9 +317,7 @@
store_info: "", store_info: "",
product_id: "", product_id: "",
"store_name": "", "store_name": "",
"imageList": [ "imageList": [],
],
attr: [{ attr: [{
detail: [{ detail: [{
attr: 'name' attr: 'name'
@ -328,9 +325,7 @@
value: " " value: " "
}, ], }, ],
"attrValue": [{ "attrValue": [{
detail: { detail: {},
},
"price": "", "price": "",
"unit_name": "", "unit_name": "",
"wholesale_unit_name": "", "wholesale_unit_name": "",
@ -351,24 +346,17 @@
"cate_name": "", "cate_name": "",
"unit_name": "", "unit_name": "",
"cate_id": '', "cate_id": '',
"mer_cate_id": [ "mer_cate_id": [],
],
"mer_cate_name": "", "mer_cate_name": "",
"spec_type": "", "spec_type": "",
"specifica": "", "specifica": "",
"delivery_way": [ "delivery_way": [],
],
"delivery_free": "1", "delivery_free": "1",
"temp_id": "", "temp_id": "",
"tempName": "", "tempName": "",
"once_min_count": "", "once_min_count": "",
"image": "", "image": "",
"slider_image": [ "slider_image": [""],
""
],
"is_good": 0, "is_good": 0,
"is_gift_bag": 0, "is_gift_bag": 0,
"sort": "", "sort": "",
@ -388,7 +376,6 @@
value: '' value: ''
}] }]
} }
}, },
mer_id: "", mer_id: "",
maxLength: 30, maxLength: 30,
@ -405,16 +392,13 @@
range: [{ range: [{
value: 0, value: 0,
text: "篮球" text: "篮球"
}, }, {
{
value: 1, value: 1,
text: "足球" text: "足球"
}, }, {
{
value: 2, value: 2,
text: "游泳" text: "游泳"
}, }],
],
text: "", text: "",
text1: "", text1: "",
value1: "", value1: "",
@ -422,12 +406,10 @@
checkboxList1: [{ checkboxList1: [{
name: '到店核销', name: '到店核销',
value: '1', value: '1',
}, }, {
{
name: '快递配送', name: '快递配送',
value: '2', value: '2',
} }],
],
attrRules: { attrRules: {
price: '单价不能为空', price: '单价不能为空',
unit_name: '计量单位不能为空', unit_name: '计量单位不能为空',
@ -462,7 +444,6 @@
message: '请填写完整商品规格', message: '请填写完整商品规格',
trigger: ['change', 'blur'], trigger: ['change', 'blur'],
}], }],
'store_name': { 'store_name': {
type: 'string', type: 'string',
required: true, required: true,
@ -491,8 +472,6 @@
message: '请上传商品详情图', message: '请上传商品详情图',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}, },
}, },
radio: '', radio: '',
switchVal: false switchVal: false
@ -509,10 +488,6 @@
}, },
methods: { methods: {
test(index) {
// this.formData.imageList.splice(index, 1)
console.log(this.formData, index)
},
preViewImg(url) { preViewImg(url) {
let that = this let that = this
uni.previewImage({ uni.previewImage({

20
pages/product/list/index.vue
View File

@ -7,14 +7,9 @@
:clearabled="false" @clickIcon="scanQRcodes"></u-search> :clearabled="false" @clickIcon="scanQRcodes"></u-search>
</view> </view>
<u-tabs @touchend.stop :current='current' :list="tabList" @click="selectMenu" type='primary' <u-tabs @touchend.stop :current='current' :list="tabList" @click="selectMenu" type='primary'
lineColor='#32BB3B'></u-tabs> lineColor='#32BB3B'></u-tabs>
<view class="wrapper" style="background-color: #F1F1F1;"> <view class="wrapper" style="background-color: #F1F1F1;">
<view class='product_list' v-if="productList && productList.length > 0"> <view class='product_list' v-if="productList && productList.length > 0">
<view v-for="(item,index) in productList" :key="index" class="card"> <view v-for="(item,index) in productList" :key="index" class="card">
@ -35,16 +30,18 @@
</view> </view>
</view> </view>
<view class="" style="color: #FC452F;font-size: 24rpx;"> <view class="" style="color: #FC452F;font-size: 24rpx;"
v-if="isWholeSale == 0 || isWholeSale == 2">
<text style="color:#989898" v-if='isWholeSale'>零售：</text> <text <text style="color:#989898" v-if='isWholeSale'>零售：</text> <text
style="font-size: 22rpx;">￥</text><text>{{item.price}}</text><text style="font-size: 22rpx;">￥</text><text>{{item.price}}</text><text
style="color: #828282;">/{{item.unit_name}}</text> style="color: #828282;">/{{item.unit_name}}</text>
</view> </view>
<view class="" style="color: #FC452F;font-size: 24rpx;" v-if='isWholeSale'> <view class="" style="color: #FC452F;font-size: 24rpx;"
v-if="isWholeSale == 1 || isWholeSale == 2">
<text style="color:#989898">批发：</text> <text <text style="color:#989898">批发：</text> <text
style="font-size: 22rpx;">￥</text><text>{{item.attrValue[0].wholesale_price}}</text><text style="font-size: 22rpx;">￥</text><text>{{item.wholesale_price}}</text><text
style="color: #828282;">/{{item.attrValue[0].wholesale_unit_name}}</text> style="color: #828282;">/{{item.wholesale_unit_name}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -277,7 +274,7 @@
sjList: [2, 4], sjList: [2, 4],
xjItem: "", xjItem: "",
showOverly: false, showOverly: false,
isWholeSale: false, isWholeSale: '',
status: 'loadmore', status: 'loadmore',
current: "", current: "",
where: { where: {
@ -336,7 +333,8 @@
this.newUser = Boolean(options.diver) this.newUser = Boolean(options.diver)
this.getUserInfo() this.getUserInfo()
this.getCategoryList(); this.getCategoryList();
this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale == 2; this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale;
if (options.type) { if (options.type) {
this.where.type = options.type this.where.type = options.type
} }

14
pages/product/updateStock/updateStock.vue
View File

@ -18,10 +18,13 @@
库存： {{attrvalueStock}} 库存： {{attrvalueStock}}
</view> </view>
</view> </view>
<view class="" style="color: #FC452F;font-size: 24rpx;"> <view class="" style="color: #FC452F;font-size: 24rpx;" v-if="isWholeSale == 0 || isWholeSale ==2">
<text <text style="font-size: 22rpx;">￥</text><text>{{short.price }}</text><text
style="font-size: 22rpx;">￥</text><text>{{short.attrValue && short.attrValue[0].price}}</text><text style="color: #828282;">/{{short.unit_name }}</text>
style="color: #828282;">/{{short.attrValue && short.attrValue[0].unit_name}}</text> </view>
<view class="" style="color: #FC452F;font-size: 24rpx;" v-if="isWholeSale == 1 || isWholeSale ==2">
<text style="font-size: 22rpx;">￥</text><text>{{short.wholesale_price }}</text><text
style="color: #828282;">/{{short.wholesale_unit_name }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -100,6 +103,7 @@
product_id: '' product_id: ''
}, },
attrvalueStock: 0, attrvalueStock: 0,
isWholeSale: ''
} }
}, },
onLoad(options) { onLoad(options) {
@ -108,6 +112,8 @@
if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo); if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
this.mer_id = userInfo.service.mer_id; this.mer_id = userInfo.service.mer_id;
this.initInfo(); this.initInfo();
this.isWholeSale = userInfo?.mer_info?.wholesale;
}, },
onShow() {}, onShow() {},
methods: { methods: {