xhj 2 rokov pred
rodič
commit
6a171d33c0
4 zmenil súbory, kde vykonal 18 pridanie a 81 odobranie
  1. 1 1
      merchant/index.vue
  2. 16 68
      merchant/order.vue
  3. 1 2
      merchant/search.vue
  4. 0 10
      merchant/show.vue

+ 1 - 1
merchant/index.vue

@@ -259,7 +259,7 @@ export default {
 			this.isLoad = false;
 			let form = this.form;
 			req.getRequest(
-				'/api/order/merchant/list',
+				'/admin/orderMall/list',
 				form,
 				data => {
 					if (this.form.page == 1) {

+ 16 - 68
merchant/order.vue

@@ -5,55 +5,18 @@
 				<view class="searchbot dflex">
 					<image src="../merchant/static/images/ssico.png"></image>
 					<input placeholder="请输入订单号、客户手机号后4位" class="flex" :value="searchTitle" @input="onSearch" @confirm="confirm" confirm-type="search" />
-					<!-- <image src="/static/images/clear.png" @tap="clearInput" v-if="searchTitle != ''"></image> -->
 					<view class="sousuo" @tap="confirm">搜索</view>
 				</view>
 			</view>
 			<!-- <span>搜索</span> -->
 		</view>
 		<view class="tab">
-			<view v-for="(item, index) in TabList" :key="index" :class="'li ' + (item.active ? 'active' : '')" @click="switchTab(index)">{{ item.label }}</view>
+			<view v-for="(item, index) in TabList" :key="index" :class="'fflex li ' + (item.active ? 'active' : '')" @click="switchTab(index)">{{ item.label }}</view>
 		</view>
 		<view class="tabcon">
 			<block v-if="pageList && pageList.length > 0">
-			<ul class="list" v-if="tabIndex == 2">
-				<li v-for="(item, index) in pageList" :key="index" @click="jumpUrl('refundDetail?id=' + item.id)">
-					<view class="ddbh dflex" @click="toOrederDel(item.id)">
-						<view class="ordid">
-							{{ item.orderId }}
-						</view>
-					</view>
-					<view class="lis" v-for="(pro, ind) in item.productList" :key="ind">
-						<image :src="pro.image" class="cimage" />
-						<view class="zhinfo">
-							<view class="zhtit" v-text="pro.title"></view>
-							<view v-if="pro.specsList && pro.specsList.length > 0" class="guige">
-								规格:
-								<text v-for="(itemGuige, index) in pro.specsList" :key="index" class="guige" decode="true">{{ itemGuige.value }}&nbsp;</text>
-							</view>
-							<view class="jiage">
-								<view class="price">
-									<span>¥</span>
-									{{ pro.money }}
-								</view>
-								<view class="num">×{{ pro.quantity }}</view>
-							</view>
-						</view>
-					</view>
-					<view class="total">
-						<view>共{{ item.quantity }}件</view>
-						<view>
-							总计:
-							<span>¥{{ item.refundMoney }}</span>
-						</view>
-					</view>
-					<view class="status">
-						<span class="ordidss flex">{{ item.refundStateName }}</span>
-						<!-- <view class="sta-btn" v-if="item.refundState > 29 && item.refundState < 41 && item.refundState != 32">审核</view> -->
-					</view>
-				</li>
-			</ul>
-			<ul class="list" v-else>
+			
+			<ul class="list">
 				<li v-for="(item, index) in pageList" :key="index">
 					<view class="ddbh dflex" @click="toOrederDel(item.id)">
 						<view class="ordid">
@@ -101,10 +64,8 @@
 					</view>
 					<view class="status">
 						<span class="ordidss flex">{{ item.stateName }}</span>
-						<view class="sta-btn" v-if="merchant.printer != 0 && (item.state == 3 || item.state == 4)" @click="orderPrinting(item.id, index)">打印小票</view>
 						<!-- <view class="sta-btn" v-if="item.state > 29 && item.state < 41 && item.state != 32" @click="jumpUrl('refund?id=' + item.id)">审核</view> -->
 						<view class="sta-btn" v-if="item.state == 3" @click="deliverGoods(item.id, merchantId, item.orderType)">确认发货</view>
-						<view class="sta-btn" v-if="item.state === 4" @click="send(item.id)">通知取件</view>
 						<view class="sta-btn" v-if="item.state === 4" @click="deliver(item.id, index)">已提货</view>
 					</view>
 				</li>
@@ -125,8 +86,12 @@ export default {
 		return {
 			TabList: [
 				{
-					label: '待提货',
-					state: 4,
+					label: '全部',
+					active: true
+				},
+				{
+					label: '未付款',
+					state: 1,
 					active: false
 				},
 				{
@@ -135,17 +100,14 @@ export default {
 					active: false
 				},
 				{
-					label: '售后',
+					label: '已完成',
+					state: 7,
 					active: false
 				},
-				{
-					label: '全部',
-					active: true
-				}
 			],
 			merchant: {},
 			tabIndex: '',
-			active: 3,
+			active: 0,
 			pageList: [],
 			ishow: false,
 			id: '',
@@ -164,7 +126,6 @@ export default {
 	onLoad(opt) {
 		this.active = opt.tabIndex;
 		this.merchantId = opt.merchantId;
-		this.isPrinting();
 		this.switchTab(this.active);
 	},
 	onReachBottom() {
@@ -177,14 +138,6 @@ export default {
 				url: url
 			});
 		},
-		// s是否开启云打印
-		isPrinting() {
-			let fromP = {};
-			fromP.id = this.merchantId;
-			req.getRequest('/api/merchant/detail', fromP, data => {
-				this.merchant = data;
-			});
-		},
 
 		// 查看订单详情
 		toOrederDel(id) {
@@ -262,14 +215,9 @@ export default {
 				limit: this.form.limit
 			};
 			let that = this;
-			if (this.tabIndex == 2) {
-				//售后
-				this.getRefundList(fromP);
-			} else {
-				fromP.state = this.TabList[this.tabIndex].state;
-				//正常其它订单
-				this.getOrderlists(fromP)
-			}
+			fromP.state = this.TabList[this.tabIndex].state;
+			//正常其它订单
+			this.getOrderlists(fromP)
 		},
 		getRefundList(fromP){
 			req.getRequest('/api/v3/store/refund/page', fromP, data => {
@@ -283,7 +231,7 @@ export default {
 			});
 		},
 		getOrderlists(fromP){
-			req.getRequest('/api/order/merchant/list', fromP, data => {
+			req.getRequest('/admin/orderMall/list', fromP, data => {
 				if (data && data.length == 10) {
 					this.isLoad = true;
 				}

+ 1 - 2
merchant/search.vue

@@ -60,7 +60,6 @@
 					</view>
 					<view class="status">
 						<span class="ordidss flex">{{ item.stateName }}</span>
-						<view class="sta-btn" v-if="merchant.printer != 0 && (item.state == 3 || item.state == 4)" @click="orderPrinting(item.id, index)">打印小票</view>
 						<view class="sta-btn" v-if="item.state > 29 && item.state < 41 && item.state != 32" @click="jumpUrl('refund?id=' + item.id)">审核</view>
 						<view class="sta-btn" v-if="item.state == 3" @click="deliverGoods(item.id, merchantId, item.orderType)">确认发货</view>
 						<view class="sta-btn" v-if="item.state === 4" @click="send(item.id)">通知取件</view>
@@ -150,7 +149,7 @@ export default {
 			if (!this.isLoad) return false;
 			this.isLoad = false;
 			req.getRequest(
-				'/api/order/merchant/list',
+				'/admin/orderMall/list',
 				form,
 				data => {
 					if (data && data.length == 10) {

+ 0 - 10
merchant/show.vue

@@ -290,8 +290,6 @@ export default {
 	},
 	onLoad(opt) {
 		this.id = opt.id;
-		this.merchantId = opt.merchantId;
-		this.isPrinting();
 		this.loadDetail();
 	},
 
@@ -302,14 +300,6 @@ export default {
 				url: url
 			});
 		},
-		// s是否开启云打印
-		isPrinting() {
-			let fromP = {};
-			fromP.id = this.merchantId;
-			req.getRequest('/api/merchant/detail', fromP, data => {
-				this.merchant = data;
-			});
-		},
 
 		deliverGoods() {
 			uni.navigateTo({