bug修改
This commit is contained in:
wangh
parent
ca91fa5b5a
commit
0f37e8db23
@ -111,7 +111,7 @@
|
||||
<el-table-column label="配送类型" align="center" prop="shippingType">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.shippingType=='门店自提'">{{scope.row.shippingType}}</el-tag>
|
||||
<el-tag type="success" v-if="scope.row.shippingType=='物流配送'">{{scope.row.shippingType}}</el-tag>
|
||||
<el-tag type="success" v-else-if="scope.row.shippingType=='物流配送'">{{scope.row.shippingType}}</el-tag>
|
||||
<el-tag type="info" v-else >非实物兑换</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@ -166,14 +166,14 @@
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="油品单价" prop="oilPrice">
|
||||
<el-input v-model="oilNumber.oilPrice" style="width: 217px">
|
||||
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="国标价格" prop="gbPrice">
|
||||
<el-input v-model="oilNumber.gbPrice" style="width: 217px">
|
||||
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -252,14 +252,14 @@
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="油品单价" prop="oilPrice">
|
||||
<el-input v-model="oilNumber.oilPrice" style="width: 217px">
|
||||
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="国标价格" prop="gbPrice">
|
||||
<el-input v-model="oilNumber.gbPrice" style="width: 217px">
|
||||
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -316,7 +316,7 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="预设油站价" prop="presetOilPrices">
|
||||
<el-input v-model="oilPresetPrices.presetOilPrices" style="width: 217px">
|
||||
<el-input v-model="oilPresetPrices.presetOilPrices" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -326,7 +326,7 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="预设国标价" prop="presetGbPrice">
|
||||
<el-input v-model="oilPresetPrices.presetGbPrice" style="width: 217px">
|
||||
<el-input v-model="oilPresetPrices.presetGbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -371,11 +371,11 @@ import {
|
||||
|
||||
data() {
|
||||
var valiNumberPass = (rule, value, callback) => {//包含小数的数字
|
||||
let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
|
||||
let reg = /^[+-]?(0|([1-9]\d*))(\.\d{1,2})?$/;
|
||||
if (value === '') {
|
||||
callback(new Error('请输入内容'));
|
||||
} else if (!reg.test(value)) {
|
||||
callback(new Error('请输入数字'));
|
||||
callback(new Error('请输入数字，最多保留两位小数'));
|
||||
} else {
|
||||
callback();
|
||||
}
|
||||
@ -391,8 +391,6 @@ import {
|
||||
],
|
||||
presetOilPrices: [
|
||||
{ required: true, validator:valiNumberPass, trigger: "blur" }
|
||||
// {required: true, message: '请输入', trigger: 'blur'},
|
||||
// { type: 'number', message: '价格必须为数字值'}
|
||||
],
|
||||
presetGbPrice: [
|
||||
{ required: true, validator:valiNumberPass, trigger: "blur" }
|
||||
@ -413,7 +411,6 @@ import {
|
||||
],
|
||||
oilPrice: [
|
||||
{ required: true, validator:valiNumberPass, trigger: "blur" }
|
||||
|
||||
],
|
||||
gbPrice: [
|
||||
{ required: true, validator:valiNumberPass, trigger: "blur" }
|
||||
@ -506,7 +503,6 @@ import {
|
||||
methods: {
|
||||
|
||||
|
||||
|
||||
getStatusText(data) {
|
||||
if (data == 1) {
|
||||
return "停止"
|
||||
@ -657,7 +653,6 @@ import {
|
||||
},
|
||||
|
||||
|
||||
|
||||
// 打开修改窗口
|
||||
openOilNumberEdit(item) {
|
||||
this.oilNumber = {};
|
||||
@ -826,7 +821,7 @@ import {
|
||||
|
||||
getSecondName() {
|
||||
this.$forceUpdate();
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -43,7 +43,7 @@ images.root=d:/rouyi/uploadPath
|
||||
images.path=/static/uploadImages/
|
||||
|
||||
# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
|
||||
images.upload.url=http://localhost:8080
|
||||
images.upload.url=http://localhost:8008
|
||||
|
||||
# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
|
||||
images.upload.maxSize=5
|
||||
@ -51,7 +51,7 @@ images.upload.maxSize=5
|
||||
################## \u5B9A\u65F6\u811A\u672C\u914D\u7F6E #########################
|
||||
# \u5B9A\u65F6\u53D1\u9001\u6D88\u606F
|
||||
message.job.switch = 1
|
||||
message.job.time = 0 0/1 * * * ?
|
||||
message.job.time = 0 0/1 * * * ?z
|
||||
|
||||
# \u5361\u5238\u5230\u671F\u5904\u7406
|
||||
couponExpire.job.switch = 1
|
||||
|
||||
@ -311,13 +311,12 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
|
||||
cardFavorableRecord.setExchangeFrom("积分兑换");
|
||||
cardFavorableRecordService.addCardFavorableRecord(cardFavorableRecord);
|
||||
}else if(integralGift.getGiftType().equals("实物商品")) {
|
||||
// 查询礼品信息
|
||||
|
||||
// 修改商品库存并增加记录
|
||||
LJGoodsDto goods = new LJGoodsDto();
|
||||
|
||||
goods.setId(integralGift.getGoodsId());
|
||||
// goods.setDocument();
|
||||
goods.setDocument("积分兑换");
|
||||
goods.setNumberOfChanges(-integralOrders.getExchangeQuantity());
|
||||
goods.setGoodsNo(integralOrders.getOrderNumber());
|
||||
ljGoodsService.editGoodsInventory(goods);
|
||||
}
|
||||
|
||||
|
||||
@ -81,6 +81,7 @@ public class MtStore extends BaseEntity implements Serializable {
|
||||
|
||||
@ApiModelProperty("福利信息")
|
||||
private String welfare;
|
||||
private String ifDelete;
|
||||
|
||||
@ApiModelProperty("门头照")
|
||||
private String doorstepPhoto;
|
||||
|
||||
@ -56,6 +56,7 @@ public class ChainStoreInfoServiceImpl extends ServiceImpl<ChainStoreInfoMapper,
|
||||
if (ObjectUtil.isNotEmpty(chainStoreInfo.getStatus())) {
|
||||
queryWrapper.eq(MtStore :: getStatus,chainStoreInfo.getStatus());
|
||||
}
|
||||
queryWrapper.eq(MtStore::getIfDelete,0);
|
||||
queryWrapper.eq(MtStore::getChainStoreId,it.getId()).orderByDesc(BaseEntity::getCreateTime);
|
||||
List<MtStore> list = storeService.list(queryWrapper);
|
||||
for (MtStore mtStore : list) {
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
border-radius: 5px;text-align: center">
|
||||
<el-tooltip placement="top">
|
||||
<div slot="content">
|
||||
会员等级：{{ getGrade(member.gradeId) }}
|
||||
会员等级：{{ member.gradeId?getGrade(member.gradeId):'未知' }}
|
||||
</div>
|
||||
<i class="el-icon-medal" style="font-size: 35px"></i>
|
||||
</el-tooltip>
|
||||
@ -526,6 +526,8 @@ import {
|
||||
},
|
||||
// 选择会员
|
||||
chooseUser(mobile,id){
|
||||
console.log("this.member",this.member)
|
||||
if (this.member.id) {
|
||||
this.dialogVisiblevip = false
|
||||
this.isMember = true;
|
||||
// this.map.payUser = mobile;
|
||||
@ -538,6 +540,11 @@ import {
|
||||
this.consumeAmount = this.balance;
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
|
||||
}
|
||||
}else {
|
||||
this.$message.error('请先选择会员');
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
// 选择会员信息
|
||||
handleChoose(data){
|
||||
|
||||
@ -223,7 +223,7 @@
|
||||
if (uni.getStorageSync("storeId")) {
|
||||
this.storeId = uni.getStorageSync("storeId")
|
||||
} else {
|
||||
let storeId = "34";
|
||||
let storeId = "12";
|
||||
|
||||
uni.setStorageSync("storeId", storeId)
|
||||
}
|
||||
|
||||
@ -156,6 +156,8 @@
|
||||
<style scoped lang="scss">
|
||||
.content {
|
||||
background: #f4f5f6;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.container {
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<view class="dis">
|
||||
<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
|
||||
<view class="boximg">
|
||||
<image src="../../static/logo.png" mode=""></image>
|
||||
<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="">{{storeName}}</view>
|
||||
@ -110,7 +110,7 @@
|
||||
<view style="color: #9d9d9d; font-size: 12px; ">积分账户{{myPoints}}</view>
|
||||
</view>
|
||||
<view @click="choose()" class="andeniu">
|
||||
<text>选择</text>
|
||||
<text>兑换</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -133,6 +133,7 @@
|
||||
goodsInfo: '',
|
||||
storeName: '',
|
||||
storeAddress: '',
|
||||
logo: '',
|
||||
flag: false, // 禁用
|
||||
title: '',
|
||||
qhindex: 0,
|
||||
@ -510,19 +511,19 @@
|
||||
},
|
||||
|
||||
// 根据storeid 查找店铺信息
|
||||
getStroeById() {
|
||||
request({
|
||||
url: 'business/storeInformation/store/storeInfoUni',
|
||||
method: 'get',
|
||||
params: {
|
||||
storeId: uni.getStorageSync('storeId')
|
||||
}
|
||||
}).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.myPoints = res.data.points
|
||||
}
|
||||
})
|
||||
},
|
||||
// getStroeById() {
|
||||
// request({
|
||||
// url: 'business/storeInformation/store/storeInfoUni',
|
||||
// method: 'get',
|
||||
// params: {
|
||||
// storeId: uni.getStorageSync('storeId')
|
||||
// }
|
||||
// }).then((res) => {
|
||||
// if (res.code == 200) {
|
||||
// this.myPoints = res.data.points
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
// 根据storeId查询店铺信息
|
||||
getInfoByStoreId() {
|
||||
request({
|
||||
@ -535,6 +536,7 @@
|
||||
if (res.code == 200) {
|
||||
this.storeName = res.data.name
|
||||
this.storeAddress = res.data.address
|
||||
this.logo = res.data.logo
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user