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

更新功能

This commit is contained in:
weipengfei 2023-11-10 18:02:50 +08:00
parent 577c7c9d54
commit 871030f037
4 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/behalfAdmin.js
View File

@ -25,3 +25,11 @@ export function behalfAdminNumber(data) {
return request.get("behalf_admin/number", data);
}
/**
* 生成二维码
*
*/
export function behalfAdminCode(data) {
return request.get("behalf_admin/code", data);
}

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

@ -18,7 +18,7 @@
</view>
<block v-for="(item,index) in list" :key="index">
<view class="item_list flex">
<view class="item_list flex" @click="navToGoodsDetails(item)">
<view>
<image class="goods_image" :src="item.image" mode="aspectFit"></image>
</view>
@ -35,7 +35,7 @@
<text>订货价:</text>
<text>{{' '+item.price}}</text>
</view>
<view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view>
<!-- <view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view> -->
</view>
</view>
</block>
@ -242,6 +242,15 @@
}
},
/**
* 跳转到产品详情
*/
navToGoodsDetails(item){
console.log(item);
uni.navigateTo({
url: `pages/goods_details/index?id=${item.product_id}&referer=`
})
},
/*
* 加入购物车
*/

103
pages/product/addGoods/index.vue
View File

@ -91,57 +91,58 @@
</view>
</view>
<priceComponent :product_id="product_id" :bar_code="code" @updateCode = "updateCode" v-if="showCommodity"></priceComponent>
<!-- <view class="popup_group">
<view class="radio">
<view class="radio_label ">规格选择</view>
<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
<label class="radio_select" v-for="(val, i) in specificationsRadioList" :key="val.value">
<view>
<radio :value="val.value" :checked="val.value == setFormData.spec_type" />
</view>
<view>{{ val.name }}</view>
</label>
</radio-group>
</view>
<view class="popup_group_item" @click="selectSpecification" v-if="setFormData.spec_type == 1">
<view class="popup_group_item_label">选择规格</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.specifica"
class="popup_group_item_message_value">{{ setFormData.specifica }}</span>
<span v-else>去选择</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
<view class="popup_group_item" @click="setSpecifica" v-if="setFormData.spec_type == 0">
<view class="popup_group_item_label">价格设置</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.setSpecificaValue"
class="popup_group_item_message_value">{{setFormData.setSpecificaValue}}</span>
<span v-else>去设置</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
<view class="popup_group_item" @click="setSpecifica"
v-if="setFormData.spec_type == 1 && setFormData.specifica">
<view class="popup_group_item_label">价格设置</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.setSpecificaValue2"
class="popup_group_item_message_value">{{setFormData.setSpecificaValue2}}</span>
<span v-else>去设置</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
</view> -->
<view class="radio">
<view class="radio_label ">规格选择</view>
<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
<label class="radio_select" v-for="(val, i) in specificationsRadioList" :key="val.value">
<view>
<radio :value="val.value" :checked="val.value == setFormData.spec_type" />
</view>
<view>{{ val.name }}</view>
</label>
</radio-group>
</view>
<view class="popup_group_item" @click="selectSpecification" v-if="setFormData.spec_type == 1">
<view class="popup_group_item_label">选择规格</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.specifica"
class="popup_group_item_message_value">{{ setFormData.specifica }}</span>
<span v-else>去选择</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
<view class="popup_group_item" @click="setSpecifica" v-if="setFormData.spec_type == 0">
<view class="popup_group_item_label">价格设置</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.setSpecificaValue"
class="popup_group_item_message_value">{{setFormData.setSpecificaValue}}</span>
<span v-else>去设置</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
<view class="popup_group_item" @click="setSpecifica"
v-if="setFormData.spec_type == 1 && setFormData.specifica">
<view class="popup_group_item_label">价格设置</view>
<view class="popup_group_item_value">
<view class="popup_group_item_message">
<span v-if="setFormData.setSpecificaValue2"
class="popup_group_item_message_value">{{setFormData.setSpecificaValue2}}</span>
<span v-else>去设置</span>
</view>
<view><span class="iconfont">&#xe6bd;</span></view>
</view>
</view>
</view> -->
<priceComponent :product_id="product_id" :bar_code="code" @updateCode = "updateCode" v-if="showCommodity"></priceComponent>
<view class="popup_group">
@ -606,7 +607,7 @@
this
.setFormData.slider_image
];
this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
this.setFormData.cate_name = editGoodsDetils?.storeCategory?.cate_name; // 平台分类回显
this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(
item => item
.category && item.category.cate_name).join(',') : '';

30
pages/replace_replenishment/replace.vue
View File

@ -264,7 +264,7 @@
<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
<block v-if="item.order_status==2">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>去发货</view>
<view class='bnt b-color' @click='consignment(item.order_id)'>去发货</view>
</block>
<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
@ -362,6 +362,15 @@
<view class="cle" @click="close">取消</view>
</view>
</u-popup>
<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpShow = false">
<view style="text-align: center;margin-top: 30rpx;">
请把二维码展示给取货人员
</view>
<view style="padding: 28.07rpx;">
<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
</view>
</u-popup>
</view>
</template>
@ -389,7 +398,8 @@
} from '@/api/order.js';
import{
behalfAdminOrderList,
behalfAdminNumber
behalfAdminNumber,
behalfAdminCode
} from "@/api/behalfAdmin.js"
import {
getUserInfo
@ -411,6 +421,7 @@
import {
HTTP_REQUEST_URL
} from '@/config/app';
import { Toast } from '../../libs/uniApi';
export default {
components: {
payment,
@ -424,6 +435,8 @@
loading: false, //是否加载中
loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语
popUpShow: false, //二维码弹窗
payCodeUrl: '', //二维码地址
orderList: [], //订单数组
presellProList: [], //定金预售订单
presellOrderCount: 0,
@ -693,6 +706,19 @@
}
// #endif
},
/**
* 去发货
*/
consignment: function(order_id) {
this.popUpShow = true;
behalfAdminCode({
order_id
}).then((res)=>{
this.payCodeUrl = res.data.qrcode;
}).catch((e)=>{
Toast(e)
})
},
/**
* 提示
*/