liuqing
/
htb_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

消缺

Browse Source
main
liudan 10 months ago
parent a997517ff2
commit d1b3c1f05a
6 changed files with 120 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 44
      view/admin/src/router/index.js
  2. 41
      view/admin/src/views/order/list/orderDetails.vue
  3. 2
      view/admin/src/views/order/orderCancellate/index.vue
  4. 7
      view/mer/src/api/setting.js
  5. 12
      view/mer/src/views/product/addProduct/index.vue
  6. 62
      view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue

44
view/admin/src/router/index.js
Unescape View File

@ -66,31 +66,31 @@ export const constantRoutes = [
communityRouter,
deliveryRouter,
statisticRoute,
{
path: roterPre,
component: Layout,
redirect: `${roterPre}/dashboard`,
children: [
{
path: `${roterPre}/dashboard`,
component: () => import('@/views/dashboard/index'),
name: 'Dashboard',
meta: { title: '控制台', icon: 'dashboard', affix: true }
}
]
},
// {
// path: roterPre,
// component: Layout,
// redirect: `${roterPre}/dashboard`,
// children: [
// {
// path: `${roterPre}/dashboard`,
// component: () => import('@/views/dashboard/index'),
// name: 'Dashboard',
// meta: { title: '控制台', icon: 'dashboard', affix: true }
// }
// ]
// },
{
path: '/',
component: Layout,
redirect: `${roterPre}/dashboard`,
children: [
{
path: `${roterPre}/dashboard`,
component: () => import('@/views/dashboard/index'),
name: 'Dashboard',
meta: { title: '控制台', icon: 'dashboard', affix: true }
}
]
redirect: `${roterPre}/product/examine`,
// children: [
// {
// path: `${roterPre}/dashboard`,
// component: () => import('@/views/dashboard/index'),
// name: 'Dashboard',
// meta: { title: '控制台', icon: 'dashboard', affix: true }
// }
// ]
},
{
path: `${roterPre}/login`,

41
view/admin/src/views/order/list/orderDetails.vue
Unescape View File

@ -113,10 +113,7 @@
<div>订单总价：</div>
<div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div>
</li>
<li class="item" v-if="orderDetailList.svip_discount">
<div>会员商品优惠：</div>
<div class="value">{{ orderDetailList.svip_discount }}</div>
</li>
<li class="item">
<div>支付运费：</div>
<div class="value">{{ orderDetailList.pay_postage }}</div>
@ -125,20 +122,8 @@
<div>推广人：</div>
<div class="value">{{ orderDetailList.TopSpread.nickname }}</div>
</li>
<li class="item">
<div>一级佣金：</div>
<div class="value">
{{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
<em v-if="orderDetailList.refund_extension_one > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_one }})</em>
</div>
</li>
<li class="item">
<div>二级佣金：</div>
<div class="value">
{{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
<em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
</div>
</li>
</ul>
</div>
<div class="section" v-if="orderDetailList.delivery_type === '1'">
@ -300,6 +285,26 @@
<el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="total, sizes, prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" />
</div>
</el-tab-pane>
<el-tab-pane label="店铺信息" name="shopInfo">
<div class="section">
<div class="title">店铺信息</div>
<ul class="list">
<li class="item">
<div>商户名称：</div>
<div class="value">初时</div>
</li>
<li class="item">
<div>商户类型：</div>
<div class="value">厂家直销</div>
</li>
<li class="item">
<div>商户类别：</div>
<div class="value">非自营</div>
</li>
</ul>
</div>
</el-tab-pane>
<el-tab-pane v-if="childOrder.length>0" label="关联订单" name="subOrder">
<el-table :data="childOrder">
<el-table-column label="订单编号" prop="order_sn" min-width="150">

2
view/admin/src/views/order/orderCancellate/index.vue
Unescape View File

@ -78,7 +78,7 @@
</el-form-item>
</el-form>
</div>
<cards-data :card-lists="cardLists" />
<!-- <cards-data :card-lists="cardLists" /> -->
</div>
<el-table
v-loading="listLoading"

7
view/mer/src/api/setting.js
Unescape View File

@ -238,3 +238,10 @@ export function updatedumpDataApi(data) {
export function printerDeleteApi(id) {
return request.delete(`store/printer/delete/${id}`)
}
//获取区域列表
export function getArea(id) {
return request.get(`store/city/lst/${id}`)
}
// export function getArea() {
// return request.get('system/city/lst')
// }

12
view/mer/src/views/product/addProduct/index.vue
Unescape View File

@ -109,7 +109,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col v-bind="grid2">
<!-- <el-col v-bind="grid2">
<el-form-item label="品牌选择：">
<el-select
v-model="formValidate.brand_id"
@ -125,7 +125,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item label="商品封面图：" prop="image">
<div
@ -1179,28 +1179,28 @@
@click="handleSubmit('formValidate')"
>提交
</el-button>
<el-button
<!-- <el-button
:loading="loading"
type="primary"
class="submission"
size="small"
@click="handlePreview('formValidate')"
>预览
</el-button>
</el-button> -->
</el-form-item>
</el-form>
</el-card>
<!--添加服务保障模板-->
<guarantee-service ref="serviceGuarantee" @get-list="getGuaranteeList" />
<!--预览商品-->
<div v-if="previewVisible">
<!-- <div v-if="previewVisible">
<div class="bg" @click.stop="previewVisible = false" />
<preview-box
v-if="previewVisible"
ref="previewBox"
:preview-key="previewKey"
/>
</div>
</div> -->
<!-- 生成淘宝京东表单-->
<tao-bao ref="taoBao" @info-data="infoData" />
</div>

62
view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue
Unescape View File

@ -288,6 +288,14 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="商户地区：" prop="district_id">
<el-cascader ref="tree" v-model="merData.district_id" :props="props"></el-cascader>
</el-form-item>
</el-col>
</el-row>
<div style="width: 460px;margin-left: 150px;">
<Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey" :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)" :address="merData.mer_address" @getCoordinates="getCoordinates" />
</div>
@ -412,7 +420,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import { storeGetInfoApi, marginCode, marginRecordLst, marginRefund } from '@/api/setting'
import { storeGetInfoApi, marginCode, marginRecordLst, marginRefund,getArea } from '@/api/setting'
import { getBaseInfo, merchantUpdate } from '@/api/user.js'
import Maps from '@/components/map/map.vue'
import { getToken } from '@/utils/auth'
@ -514,6 +522,7 @@ export default {
value1: "",
value2: "",
merData: {
district_id:null,
delivery_way: [],
mer_take_name: '',
mer_take_phone: '',
@ -523,6 +532,55 @@ export default {
mer_take_location: '',
id: 0,
mer_take_status: 0 }, // 默认数据
props: {
lazy: true,
lazyLoad (node, resolve) {
console.log(node)
const { level } = node;
if(level==0){
getArea(0).then(res=>{
let nodes=res.data.map(item=>{
return{
value:item.id,
label:item.name,
leaf:false
}
})
resolve(nodes);
})
}else if(level==1){
getArea(node.value).then(res=>{
let nodes=res.data.map(item=>{
return{
value:item.id,
label:item.name,
leaf:false
}
})
resolve(nodes);
})
}else if(level==2){
getArea(node.value).then(res=>{
let nodes=res.data.map(item=>{
return{
value:item.id,
label:item.name,
leaf:true
}
})
resolve(nodes);
})
}
}
},
myHeaders: { 'X-Token': getToken() },
uploadedQualifications: [], // 资质图片列表
merPicList:[],//店铺相册
@ -682,7 +740,7 @@ export default {
if (valid) {
const dataKey = Object.keys(this.rules)
const reqData = {};
[...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'service_phone'].map(item => {
[...dataKey, 'mer_state', 'long', 'lat', 'mini_banner', 'service_phone','district_id'].map(item => {
reqData[item] = this.merData[item]
})
reqData.type = this.infoType

Write Preview
Loading…
Cancel
Save