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

Compare commits

base: mkm:0ef83a8e7976872415d0b0e1aeac8cb471905c09
Branches Tags
mkm:main
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
..
compare: mkm:699974b91821ea19aa4e7f40fb5d01c571d27b09
Branches Tags
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
mkm:main

No commits in common. "0ef83a8e7976872415d0b0e1aeac8cb471905c09" and "699974b91821ea19aa4e7f40fb5d01c571d27b09" have entirely different histories.
0ef83a8e79 ... 699974b918

14 changed files with 185 additions and 283 deletions
Show Stats Expand all files Collapse all files

27
components/barcode.vue
View File

@ -1,8 +1,13 @@
<template>
<view class="component text-center">
<view class="component-title">{{name}}</view>
<view class="component-title">蛋黄酥</view>
<view class="component-code">
<tki-barcode ref="barcode" onval :val="code" :load-make="true" :opations="barOpations" />
<tki-barcode
ref="barcode"
onval
:val="code"
:load-make="true"
:opations="barOpations"/>
</view>
<view class="example">{{code}}</view>
<!-- <view class="component-qr">
@ -32,7 +37,6 @@
},
data() {
return {
name: '',
code: '',
barOpations: {
height: 150,
@ -41,9 +45,8 @@
}
},
methods: {
init(val) {
this.name = val.name;
this.code = val.code // 生成一维码和二维码
init () {
this.code = '0000000000000' // 生成一维码和二维码
// setTimeout(() => {
// this.code = '0987654321' // 5 秒后刷新一维码和二维码
// }, 5000)
@ -62,7 +65,6 @@
flex: 1;
margin: 32rpx;
padding: 64rpx 32rpx;
&-title {
max-height: 112rpx;
font-size: 40rpx;
@ -70,17 +72,14 @@
line-height: 56rpx;
overflow: hidden;
}
&-code {
height: 150rpx;
margin: 32rpx 32rpx 0;
}
&-qr {
height: 250rpx;
margin-top: 36rpx;
}
.coupon-no-view {
margin: 0 18rpx;
height: 76rpx;
@ -90,32 +89,26 @@
align-items: center;
padding: 0 24rpx;
margin-top: 36rpx;
text {
font-size: 24rpx;
font-weight: 400;
&:first-child {
color: #999999;
}
}
.coupon-no {
flex: 1;
text-align: left;
}
}
}
.component-title{
text-align: center;
font-size: 34rpx;
}
.example {
text-align: center;
letter-spacing: 12rpx;
/* 设置字符间距 */
letter-spacing: 12rpx; /* 设置字符间距 */
font-weight: bold;
font-size: 32rpx;
}

2
components/shortPopup.vue
View File

@ -230,7 +230,7 @@
product_attr_unique: this.sku[this.changeSkuKey].unique,
product_id: this.datas.product_id,
product_type: this.datas.product_type,
source: this.source||11, // 11-供货采购
source: this.source||13, // 13-供货采购
spread_id: "",
}
let that = this

2
main.js
View File

@ -18,11 +18,9 @@ import {
import skeleton from './components/skeleton/index.vue'
import BaseMoney from './components/BaseMoney.vue';
import uView from '@/uni_modules/uview-ui'
import barcode from "@/components/barcode.vue"
Vue.use(uView)
Vue.component('skeleton', skeleton)
Vue.component('BaseMoney', BaseMoney)
Vue.component('barcode', barcode)
Vue.prototype.$util = util;
Vue.prototype.$Cache = Cache;
Vue.prototype.$procure_price = (item)=>{

30
pages/admin/orderDetail/index.vue
View File

@ -45,9 +45,6 @@
{{ item.cart_info.product.store_name }}
</view>
<view class="attr">{{ item.cart_info.product.suk }}</view>
<view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)" v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
商品条码: {{ item.cart_info.productAttr.product.bar_code }}
</view>
</view>
</view>
<view class="money">
@ -55,7 +52,7 @@
<view class="num">x{{ item.product_num }}
<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
</view>
<!-- <view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view> -->
<view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>
</view>
</view>
</navigator>
@ -185,9 +182,6 @@
</view>
</u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode>
</view>
</view>
</template>
<script>
@ -224,7 +218,6 @@
props: {},
data: function() {
return {
showBar: false,
order: false,
change: false,
order_id: "",
@ -280,13 +273,7 @@
},
methods: {
showBarCode(val){
this.showBar = true
this.$refs['code'].init({
name: val.store_name,
code: val.bar_code
});
},
//收件码
toPostagequ(item){
this.popUpShow = true
@ -1000,17 +987,4 @@
.public-total .money {
color: #ff4c3c;
}
.bar-code{
position: fixed;
top: 0;
left: 0;
z-index: 999999;
width: 100vw;
height: 100vh;
background-color: rgba(0,0,0,0.2);
display: flex;
align-items: center;
justify-content: center;
}
</style>

29
pages/admin/orderDetail/indexOther.vue
View File

@ -45,9 +45,6 @@
{{ item.cart_info.product.store_name }}
</view>
<view class="attr">{{ item.cart_info.product.suk }}</view>
<view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)" v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
商品条码: {{ item.cart_info.productAttr.product.bar_code }}
</view>
</view>
</view>
<view class="money">
@ -55,7 +52,7 @@
<view class="num">x{{ item.product_num }}
<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
</view>
<!-- <view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view> -->
<view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>
</view>
</view>
</navigator>
@ -185,9 +182,6 @@
</view>
</u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode>
</view>
</view>
</template>
<script>
@ -225,7 +219,6 @@
props: {},
data: function() {
return {
showBar: false,
order: false,
change: false,
order_id: "",
@ -281,13 +274,7 @@
},
methods: {
showBarCode(val){
this.showBar = true
this.$refs['code'].init({
name: val.store_name,
code: val.bar_code
});
},
//收件码
toPostagequ(item){
this.popUpShow = true
@ -1001,16 +988,4 @@
.public-total .money {
color: #ff4c3c;
}
.bar-code{
position: fixed;
top: 0;
left: 0;
z-index: 999999;
width: 100vw;
height: 100vh;
background-color: rgba(0,0,0,0.2);
display: flex;
align-items: center;
justify-content: center;
}
</style>

27
pages/admin/orderList/index.vue
View File

@ -119,9 +119,6 @@
<view class="attr" v-if="val.cart_info.productAttr.sku">
{{ val.cart_info.productAttr.sku }}
</view>
<view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
商品条码: {{ val.cart_info.productAttr.product.bar_code }}
</view>
</view>
</view>
<view class="money">
@ -217,9 +214,7 @@
</view>
</u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode>
</view>
</view>
</template>
@ -259,7 +254,6 @@
},
data() {
return {
showBar: false,
current: "",
change: false,
refundMark: false,
@ -310,13 +304,6 @@
popUpClose() {
this.popUpShow = false
},
showBarCode(val){
this.showBar = true
this.$refs['code'].init({
name: val.store_name,
code: val.bar_code
});
},
//同意先货后款订单
tongyi(id, number) {
@ -1016,16 +1003,4 @@
flex: 1;
}
}
.bar-code{
position: fixed;
top: 0;
left: 0;
z-index: 999999;
width: 100vw;
height: 100vh;
background-color: rgba(0,0,0,0.2);
display: flex;
align-items: center;
justify-content: center;
}
</style>

16
pages/admin/orderList/indexOther.vue
View File

@ -119,7 +119,7 @@
<view class="attr" v-if="val.cart_info.productAttr.sku">
{{ val.cart_info.productAttr.sku }}
</view>
<view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
<view class="attr" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
商品条码: {{ val.cart_info.productAttr.product.bar_code }}
</view>
</view>
@ -217,7 +217,7 @@
</view>
</u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false">
<view class="bar-code" v-show="showBar">
<barcode ref="code"></barcode>
</view>
</view>
@ -246,6 +246,7 @@
postconfirm,
logisticsCode
} from "@/api/admin";
import barcode from "@/components/barcode.vue"
import Loading from '@/components/Loading/index'
import PriceChange from '@/components/PriceChange/index'
import {
@ -256,6 +257,7 @@
components: {
Loading,
PriceChange,
barcode
},
data() {
return {
@ -302,6 +304,9 @@
if(option.pay_time){
this.where.pay_time = option.pay_time;
}
this.$nextTick(() => {
this.$refs['code'].init()
})
this.getIndex();
},
methods: {
@ -309,13 +314,6 @@
popUpClose() {
this.popUpShow = false
},
showBarCode(val){
this.showBar = true
this.$refs['code'].init({
name: val.store_name,
code: val.bar_code
});
},
//同意先货后款订单
tongyi(id, number) {

4
pages/nongKe/cloud_entrepot/indexb.vue
View File

@ -773,7 +773,7 @@
cartFn() {
getCartList({
product_type: 98,
source: 11
source: 13
}).then(res => {
this.totalMoney = 0
this.cartList = res.data.list
@ -786,7 +786,7 @@
})
getCartCounts({
product_type: 98,
source: 11
source: 13
}).then(res => {
this.goodsNum = res.data[0].count
})

11
pages/nongKe/supply_chain/merchant.vue
View File

@ -81,8 +81,7 @@
import {
getStoreGoods,
getProductDetail,
postCartAdd,
getStoreDetail,
postCartAdd
} from '@/api/store.js'
import { Toast } from '@/libs/uniApi'
import goodsPopup from '../cpns/goodsPopup.vue'
@ -141,7 +140,6 @@
},
onLoad(e) {
this.id = e.id
this.initStore()
this.getStoreGoodsList()
// getStoreGoods(e.id, this.infoData).then(res => {
@ -150,13 +148,6 @@
},
onShow() {},
methods: {
initStore(){
getStoreDetail(this.id).then(res=>{
console.log(res);
}).catch(e=>{
console.log(e);
})
},
async searchBtn() {
this.infoData.page = 1
const res = await getStoreGoods(this.id, this.infoData)

6
pages/nongKe/supply_chain/shopping_trolley.vue
View File

@ -20,7 +20,7 @@
<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text>
</view>
<navigator :url="hide_mer_status == 0 ? '/pages/nongKe/supply_chain/merchant?id='+item.mer_id : '#'" oldurl="/pages/store/home/index?id=" class="info">
<navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
<text class="iconfont icon-shangjiadingdan"></text>
<view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
@ -680,7 +680,7 @@
},
getCartNum: function() {
let that = this;
getCartCounts({ product_type: 98, source: 11 }).then(res => {
getCartCounts({ product_type: 98 }).then(res => {
// console.log(res);
that.cartTotalCount = res.data[0].count || 0;
});
@ -688,7 +688,7 @@
// 购物车列表
getCartList: function(isChange) {
let that = this;
getCartList({ product_type: 98, source: 11 }).then(res => {
getCartList({ product_type: 98 }).then(res => {
this.type_id=res.data?.list[0]?.type_id||[]
res.data.list.forEach((item, index) => {
item.allCheck = true

6
pages/nongKe/supply_chain/shopping_trolley_a.vue
View File

@ -20,7 +20,7 @@
<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text>
</view>
<navigator :url="hide_mer_status == 0 ? '/pages/nongKe/supply_chain/merchant?id='+item.mer_id : '#'" class="info">
<navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
<text class="iconfont icon-shangjiadingdan"></text>
<view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
@ -680,7 +680,7 @@
},
getCartNum: function() {
let that = this;
getCartCounts({ product_type: 98, source: 11 }).then(res => {
getCartCounts({ product_type: 98, source: 13 }).then(res => {
// console.log(res);
that.cartTotalCount = res.data[0].count || 0;
});
@ -688,7 +688,7 @@
// 购物车列表
getCartList: function(isChange) {
let that = this;
getCartList({ product_type: 98, source: 11 }).then(res => {
getCartList({ product_type: 98, source: 13 }).then(res => {
this.type_id=res.data?.list[0]?.type_id||[]
res.data.list.forEach((item, index) => {
item.allCheck = true

19
pages/product/addGood/addGood.vue
View File

@ -104,11 +104,11 @@
</view>
</view>
</view>
<u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?" show-cancel-button confirm-text="继续"
@confirm="changeSpecType2" @cancel="showSpecType=false"></u-modal>
<u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?"
show-cancel-button confirm-text="继续" @confirm="changeSpecType2" @cancel="showSpecType=false"
></u-modal>
</picker>
<priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef"
:product_id="product_id" :bar_code="code" @updateCode="updateCode">
<priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef" :product_id="product_id" :bar_code="code" @updateCode="updateCode">
</priceComponent>
<view v-else class="popup_group" style="margin-top: 0;border-top: 1rpx solid #eeeeee;">
<view class="popup_group_item" @click="navToSpecGood()">
@ -301,7 +301,8 @@
})
})
})
} else if (this.product_id) {
}
else if(this.product_id){
this.initDataEditData();
}
},
@ -401,10 +402,8 @@
item => item
.category && item.category.cate_name).join(',') : '';
this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
if (res.data.content && typeof res.data.content == 'string') res.data.content = JSON.parse(res.data
.content);
if(typeof res.data.content == 'string')res.data.content = JSON.parse(res.data.content);
//向组件注入数据
this.$nextTick(() => {
this.$refs.commodityRef.setDatas({
addGoodsSecoundData: {
is_good: res.data.is_good, // 是否推荐
@ -422,7 +421,6 @@
if (this.setFormData.spec_type == 0) {
this.$refs.priceRef.setDatas(res.data.attrValue[0]);
}
})
editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
hideLoading();
@ -664,7 +662,8 @@
if(this.import==1){
uni.$emit('importAttrValueOK', this.setFormData.import_id);
uni.navigateBack();
} else uni.redirectTo({
}
else uni.redirectTo({
url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
})
})

3
pages/product/addGood/components/price.vue
View File

@ -165,8 +165,7 @@
else this.formList.splice(len-1, this.formList.length);
},
setDatas(data){
console.log('收到', data);
this.singleSpecification = {...data};
this.singleSpecification = data;
},
input(val) {
this.singleSpecification = val

2
pages/users/order_list/indexCopy.vue
View File

@ -525,7 +525,7 @@
goMall(item) {
if (this.hide_mer_status == 0) {
uni.navigateTo({
url: '/pages/nongKe/supply_chain/merchant?id=' + item.mer_id
url: '/pages/store/home/index?id=' + item.mer_id
})
}
},