商品核销与商家反馈

src/PageMine/feedback.vue

@@ -49,7 +49,11 @@
           channel: 0
         }
       }
-    },
+    },
+	onLoad(options) {
+		console.log(options)
+		this.queryParams.channel = options.channelType
+	},
     methods: {
       // 提交反馈意见
       handlerSubmitFeedback() {

src/api/merchant/order.js

@@ -46,4 +46,19 @@ export function getAppointListApi(data) {
       'Content-Type': 'application/json',
     },
   });
-}
+}
+/**
+ * 订单核验-商家端核销商品
+ * @param {*} 
+ * @returns
+ */
+export function getVerificationApi(orderId,merchantId) {
+  return request({
+    url: `/maintain/order/verification/${orderId}/${merchantId}`,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
+

src/pageMerchant/storeModule/commodityWriteOff.vue

@@ -0,0 +1,112 @@
+<template>
+	<view>
+		<view class="img">
+			<image slot="icon" src="@/static/tools.jpg" style="width: 400rpx; height: 400rpx" />
+		</view>
+		<view class="but">
+			<button @click='scanCode()'>扫一扫核销</button>
+		</view>
+		<view class="bot">
+			<view class="tab" @click="toUrl()">
+				<image src="../../static/icon/QR57a.jpg" style="width: 150rpx; height: 150rpx"></image>
+				<view>查询核销</view>
+			</view>
+			<view class="tab" @click="verificationList()">
+				<image src="../../static/icon/QR57a.jpg" style="width: 150rpx; height: 150rpx"></image>
+				<view>核销记录</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getVerificationApi
+	} from '@/api/merchant/order'
+	import {
+		mapGetters
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			...mapGetters(['userId']),
+		},
+		methods: {
+			toUrl(){
+				console.log("sadas")
+				uni.navigateTo({
+					url: '/pageMerchant/storeModule/components/queryWriteOff',
+				});
+			},
+			verificationList(){
+				uni.navigateTo({
+					url: '/pageMerchant/storeModule/components/verificationList',
+				});
+			},
+			scanCode() {
+				const userId = this.userId;
+				uni.scanCode({
+					success: function(res) {
+						getVerificationApi(res.result, userId)
+							.then(response => {
+								if(response.code == "OK"){
+									uni.showToast({
+									  title: "核销成功",
+									  icon: 'success',
+									  dration: 2000,
+									});
+								}
+							})
+						console.log(res, "res")
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.img {
+		margin-top: 100rpx;
+
+		image {
+			display: block;
+			margin: 0 auto;
+		}
+	}
+
+	.but {
+		margin-top: 20rpx;
+		padding-left: 100rpx;
+		padding-right: 100rpx;
+
+		button {
+			background-color: blue;
+			color: aliceblue;
+		}
+	}
+
+	.bot {
+		color: blue;
+		margin-top: 100rpx;
+		padding-left: 200rpx;
+		padding-right: 200rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.tab {
+			text-align: center;
+
+			image {
+				display: block;
+				margin: 0 auto;
+			}
+
+			// height: 400rpx;
+		}
+	}
+</style>

src/pageMerchant/storeModule/components/queryWriteOff.vue

@@ -0,0 +1,77 @@
+<template>
+	<view>
+		<view class="img">
+			<image slot="icon" src="@/static/tools.jpg" style="width: 200rpx; height: 200rpx" />
+		</view>
+		<view class="queryWriteOff">
+			<input type="text" :value="vakue" placeholder="请输入订单号查询" />
+			<button @click='verification()'>查询核销</button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getVerificationApi
+	} from '@/api/merchant/order'
+	import {
+		mapGetters
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				value: ''
+			}
+		},
+		computed: {
+			...mapGetters(['userId']),
+		},
+		methods: {
+			verification() {
+				getVerificationApi(this.value, this.userId)
+					.then(response => {
+						if (response.code == "OK") {
+							uni.showToast({
+								title: "核销成功",
+								icon: 'success',
+								dration: 2000,
+							});
+						}
+					})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.img {
+		margin-top: 100rpx;
+
+		image {
+			display: block;
+			margin: 0 auto;
+		}
+	}
+
+	.queryWriteOff {
+		margin-top: 50rpx;
+		padding-left: 100rpx;
+		padding-right: 100rpx;
+
+		input {
+
+			border: 1px solid blue;
+			font-size: 30rpx;
+			/* 设置输入框文本大小 */
+			height: 70rpx;
+			/* 设置输入框高度 */
+		}
+
+		button {
+			margin-top: 20rpx;
+			background-color: blue;
+			color: aliceblue;
+		}
+	}
+</style>

src/pageMerchant/storeModule/components/verificationList.vue

@@ -0,0 +1,165 @@
+<template>
+	<view class="container">
+		<view class="title">核销记录</view>
+		<scroll-view class="list" scroll-y @scrolltolower="loadMore">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="order-info">
+					<view class="order-number">订单号: {{ item.orderNumber }}</view>
+					<view class="status">已核销</view>
+				</view>
+				<view class="order-details">
+					<image class="order-image" :src="item.image" mode="aspectFit"></image>
+					<view class="order-text">
+						<view class="order-name">{{ item.name }}</view>
+						<view class="order-price">价格: {{ item.price }}</view>
+						<view class="order-quantity">数量: {{ item.quantity }}</view>
+						<view class="order-date">日期: {{ item.date }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="loading" v-if="loading">{{ loadingText }}</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						orderNumber: '202201010001',
+						name: '物品A',
+						price: '10.00',
+						quantity: 2,
+						date: '2022-01-01',
+						image: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.fj7OyfWIjto_yc_uLHP90wHaEn?rs=1&pid=ImgDetMain'
+					},
+					{
+						orderNumber: '202201020002',
+						name: '物品B',
+						price: '15.00',
+						quantity: 1,
+						date: '2022-01-02',
+						image: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.fj7OyfWIjto_yc_uLHP90wHaEn?rs=1&pid=ImgDetMain'
+					},
+					{
+						orderNumber: '202201030003',
+						name: '物品C',
+						price: '8.50',
+						quantity: 3,
+						date: '2022-01-03',
+						image: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.fj7OyfWIjto_yc_uLHP90wHaEn?rs=1&pid=ImgDetMain'
+					},
+				],
+				loading: false,
+				loadingText: '正在加载中...'
+			}
+		},
+		methods: {
+			loadMore() {
+				if (this.loading) {
+					return;
+				}
+				this.loading = true;
+				
+				setTimeout(() => {
+					const newData = [{
+							orderNumber: '202201040004',
+							name: '物品D',
+							price: '12.00',
+							quantity: 1,
+							date: '2022-01-04',
+							image: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.fj7OyfWIjto_yc_uLHP90wHaEn?rs=1&pid=ImgDetMain'
+						},
+						{
+							orderNumber: '202201050005',
+							name: '物品E',
+							price: '20.00',
+							quantity: 2,
+							date: '2022-01-05',
+							image: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.fj7OyfWIjto_yc_uLHP90wHaEn?rs=1&pid=ImgDetMain'
+						}
+					];
+					this.list = [...this.list, ...newData];
+					this.loading = false;
+				}, 1000);
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 20px;
+	}
+
+	.title {
+		font-size: 24px;
+		font-weight: bold;
+		margin-bottom: 20px;
+	}
+
+	.list {
+		/* height: 400px; */
+		margin-bottom: 20px;
+	}
+
+	.item {
+		display: flex;
+		flex-direction: column;
+		margin-bottom: 20px;
+		padding: 10px;
+		border: 1px solid #ccc;
+		border-radius: 10px;
+	}
+
+	.order-info {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 10px;
+	}
+
+	.order-number {
+		font-weight: bold;
+	}
+
+	.status {
+		color: green;
+		font-size: 16px;
+	}
+
+	.order-details {
+		display: flex;
+	}
+
+	.order-image {
+		width: 100px;
+		height: 100px;
+	}
+
+	.order-text {
+		margin-left: 20px;
+	}
+
+	.order-name {
+		font-weight: bold;
+	}
+
+	.order-price {
+		margin-top: 5px;
+	}
+
+	.order-quantity {
+		margin-top: 5px;
+	}
+
+	.order-date {
+		margin-top: 5px;
+	}
+
+	.loading {
+		text-align: center;
+		margin-top: 10px;
+	}
+</style>

src/pageMerchant/tabbar/mine.vue

@@ -157,7 +157,7 @@
         list2: [{
             id: '1',
             name: '意见反馈',
-            url: '',
+            url: 'PageMine/feedback?channelType=1',
           },
           {
             id: '2',

src/pageMerchant/tabbar/store.vue

@@ -1,267 +1,258 @@
-<template>
-  <view class="shop">
-    <view style="height: 85rpx" />
-    <view class="shop__data">
-      <view class="shop__data--left">
-        <view class="text-title">店铺分</view>
-        <view class="text-num">{{ listScore.score || '--' }}</view>
-      </view>
-      <view class="shop__data--right">
-        <view>
-          <view class="text-title">今日收入（元）</view>
-          <view class="text-num">{{ listScore.amount || '0' }}</view>
-        </view>
-        <view class="line"></view>
-        <view>
-          <view class="text-title">今日订单（单）</view>
-          <view class="text-num">{{ listScore.orderCount || '0' }}</view>
-        </view>
-      </view>
-    </view>
-
-    <view class="shop__note">
-      <u-notice-bar :text="text1"></u-notice-bar>
-    </view>
-
-    <view class="shop__tools">
-      <u-grid :border="false" col="5">
-        <u-grid-item
-          v-for="(listItem, listIndex) in list"
-          :key="listIndex"
-          @click="handlerSkip(listItem, listIndex)"
-        >
-          <image src="@/static/tools.jpg" />
-          <text class="grid-text">{{ listItem.title }}</text>
-        </u-grid-item>
-      </u-grid>
-    </view>
-
-    <view class="shop__note" style="background-color: #fff">
-      <u-cell-group>
-        <u-cell size="large" :border="false" title="规制中心" isLink url=""></u-cell>
-      </u-cell-group>
-    </view>
-
-    <view>
-      <u-tabs
-        :list="list1"
-        lineWidth="40"
-        lineColor="$uni-bg-color-primary"
-        :activeStyle="{
-          color: '#000',
-          fontWeight: 'bold',
-          fontSize: '32rpx',
-          transform: 'scale(1.05)',
-          marginBottom: '15rpx',
-        }"
-        :inactiveStyle="{
-          color: '#333',
-          fontSize: '30rpx',
-          transform: 'scale(1)',
-          marginBottom: '15rpx',
-        }"
-        itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"
-      ></u-tabs>
-
-      <view style="background-color: #fff; height: 400rpx; margin-top: 20rpx"> 1111111111 </view>
-    </view>
-    <tabbar currentTab="merchantStore" />
-  </view>
-</template>
-
-<script>
-import { getOrderQuantityApi } from '@/api/merchant/order';
-export default {
-  data() {
-    return {
-      text1:
-        'uView UI众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让您快速集成，开箱即用',
-
-      list1: [
-        {
-          name: '商家社区',
-        },
-        {
-          name: '活动中心',
-        },
-        {
-          name: '商品优惠',
-        },
-      ],
-
-      list: [
-        {
-          title: '店铺管理',
-        },
-        {
-          title: '顾客评价',
-        },
-        {
-          title: '商品核销',
-        },
-        {
-          title: '商品优惠',
-        },
-        {
-          title: '经营数据',
-        },
-        {
-          title: '我的团队',
-        },
-        {
-          title: '活动中心',
-        },
-        {
-          title: '当前佣金',
-        },
-        {
-          title: '商家社区',
-        },
-        {
-          title: '预约列表',
-        },
-      ],
-      listScore: {},
-      merchantId: '',
-    };
-  },
-  created() {
-    // 获取商家id
-    let merchantInfo = this.$store.state.data.merchantInfo;
-    this.merchantId = merchantInfo.merchant.id;
-  },
-
-  mounted() {
-    // 查商家端查询订单量以及今日收入
-    this.getOrderQuantity(this.merchantId);
-  },
-
-  methods: {
-    // 点击跳转
-    handlerSkip(item, index) {
-      console.log('index', index);
-      switch (index) {
-        case 0:
-          uni.navigateTo({
-            url: '/pageMerchant/storeModule/shopManage',
-          });
-          break;
-        case 1:
-          uni.navigateTo({
-            url: '/pageMerchant/storeModule/evaluateManagement',
-          });
-          break;
-        case 2:
-          this.$u.toast('该功能暂未开发，尽情期待！');
-          break;
-        case 3:
-          uni.navigateTo({
-            url: '/pageMerchant/storeModule/couponManage',
-          });
-          break;
-        case 4:
-          this.$u.toast('该功能暂未开发，尽情期待！');
-          break;
-        case 5:
-          uni.navigateTo({
-            url: '/pageMerchant/storeModule/myTeam',
-          });
-          break;
-        case 6:
-          this.$u.toast('该功能暂未开发，尽情期待！');
-          break;
-        case 7:
-          this.$u.toast('该功能暂未开发，尽情期待！');
-          break;
-        case 8:
-          this.$u.toast('该功能暂未开发，尽情期待！');
-          break;
-        case 9:
-          uni.navigateTo({
-            url: '/pageMerchant/storeModule/appointList',
-          });
-          break;
-      }
-    },
-    async getOrderQuantity(id) {
-      let res = await getOrderQuantityApi(id);
-      if (res.code === 'OK') {
-        this.listScore = res.data;
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.text-title {
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 20rpx;
-}
-
-.text-num {
-  font-size: 40rpx;
-  font-weight: bold;
-  color: $uni-bg-color-primary;
-}
-
-.shop {
-  min-height: calc(100vh - 80rpx);
-  background-color: $uni-bg-color-page;
-  padding-top: 80rpx;
-
-  &__data {
-    display: flex;
-    text-align: center;
-
-    &--left {
-      flex: 1;
-      padding: 30rpx 20rpx;
-      background-color: $uni-bg-color;
-      margin-right: 20rpx;
-      border-radius: $uni-border-radius-base;
-    }
-
-    &--right {
-      flex: 3;
-      display: flex;
-      justify-content: space-around;
-      padding: 30rpx 20rpx;
-      background-color: $uni-bg-color;
-      border-radius: $uni-border-radius-base;
-
-      .line {
-        width: 2rpx;
-        height: 65%;
-        margin-top: 35rpx;
-        background-color: #f5f5f5;
-      }
-    }
-  }
-
-  &__note {
-    margin: 30rpx 0;
-  }
-
-  /* 工具 */
-  &__tools {
-    padding: 20rpx 10rpx;
-    background-color: $uni-bg-color;
-    border-radius: $uni-border-radius-base;
-
-    image {
-      width: 100rpx;
-      height: 100rpx;
-      display: block;
-      margin: 15rpx 0 25rpx 0;
-    }
-  }
-}
-
-::v-deep .u-cell__title-text {
-  border: 0;
-  font-weight: bold;
-  font-size: 36rpx;
-}
-</style>
+<template>
+	<view class="shop">
+		<view style="height: 85rpx" />
+		<view class="shop__data">
+			<view class="shop__data--left">
+				<view class="text-title">店铺分</view>
+				<view class="text-num">{{ listScore.score || '--' }}</view>
+			</view>
+			<view class="shop__data--right">
+				<view>
+					<view class="text-title">今日收入（元）</view>
+					<view class="text-num">{{ listScore.amount || '0' }}</view>
+				</view>
+				<view class="line"></view>
+				<view>
+					<view class="text-title">今日订单（单）</view>
+					<view class="text-num">{{ listScore.orderCount || '0' }}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="shop__note">
+			<u-notice-bar :text="text1"></u-notice-bar>
+		</view>
+
+		<view class="shop__tools">
+			<u-grid :border="false" col="5">
+				<u-grid-item v-for="(listItem, listIndex) in list" :key="listIndex"
+					@click="handlerSkip(listItem, listIndex)">
+					<image src="@/static/tools.jpg" />
+					<text class="grid-text">{{ listItem.title }}</text>
+				</u-grid-item>
+			</u-grid>
+		</view>
+
+		<view class="shop__note" style="background-color: #fff">
+			<u-cell-group>
+				<u-cell size="large" :border="false" title="规制中心" isLink url=""></u-cell>
+			</u-cell-group>
+		</view>
+
+		<view>
+			<u-tabs :list="list1" lineWidth="40" lineColor="$uni-bg-color-primary" :activeStyle="{
+          color: '#000',
+          fontWeight: 'bold',
+          fontSize: '32rpx',
+          transform: 'scale(1.05)',
+          marginBottom: '15rpx',
+        }" :inactiveStyle="{
+          color: '#333',
+          fontSize: '30rpx',
+          transform: 'scale(1)',
+          marginBottom: '15rpx',
+        }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"></u-tabs>
+
+			<view style="background-color: #fff; height: 400rpx; margin-top: 20rpx"> 1111111111 </view>
+		</view>
+		<tabbar currentTab="merchantStore" />
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderQuantityApi
+	} from '@/api/merchant/order';
+	export default {
+		data() {
+			return {
+				text1: 'uView UI众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让您快速集成，开箱即用',
+
+				list1: [{
+						name: '商家社区',
+					},
+					{
+						name: '活动中心',
+					},
+					{
+						name: '商品优惠',
+					},
+				],
+
+				list: [{
+						title: '店铺管理',
+					},
+					{
+						title: '顾客评价',
+					},
+					{
+						title: '商品核销',
+					},
+					{
+						title: '商品优惠',
+					},
+					{
+						title: '经营数据',
+					},
+					{
+						title: '我的团队',
+					},
+					{
+						title: '活动中心',
+					},
+					{
+						title: '当前佣金',
+					},
+					{
+						title: '商家社区',
+					},
+					{
+						title: '预约列表',
+					},
+				],
+				listScore: {},
+				merchantId: '',
+			};
+		},
+		created() {
+			// 获取商家id
+			let merchantInfo = this.$store.state.data.merchantInfo;
+			this.merchantId = merchantInfo.merchant.id;
+		},
+
+		mounted() {
+			// 查商家端查询订单量以及今日收入
+			this.getOrderQuantity(this.merchantId);
+		},
+
+		methods: {
+			// 点击跳转
+			handlerSkip(item, index) {
+				console.log('index', index);
+				switch (index) {
+					case 0:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/shopManage',
+						});
+						break;
+					case 1:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/evaluateManagement',
+						});
+						break;
+					case 2:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/commodityWriteOff',
+						});
+						break;
+					case 3:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/couponManage',
+						});
+						break;
+					case 4:
+						this.$u.toast('该功能暂未开发，尽情期待！');
+						break;
+					case 5:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/myTeam',
+						});
+						break;
+					case 6:
+						this.$u.toast('该功能暂未开发，尽情期待！');
+						break;
+					case 7:
+						this.$u.toast('该功能暂未开发，尽情期待！');
+						break;
+					case 8:
+						this.$u.toast('该功能暂未开发，尽情期待！');
+						break;
+					case 9:
+						uni.navigateTo({
+							url: '/pageMerchant/storeModule/appointList',
+						});
+						break;
+				}
+			},
+			async getOrderQuantity(id) {
+				let res = await getOrderQuantityApi(id);
+				if (res.code === 'OK') {
+					this.listScore = res.data;
+				}
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.text-title {
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+	}
+
+	.text-num {
+		font-size: 40rpx;
+		font-weight: bold;
+		color: $uni-bg-color-primary;
+	}
+
+	.shop {
+		min-height: calc(100vh - 80rpx);
+		background-color: $uni-bg-color-page;
+		padding-top: 80rpx;
+
+		&__data {
+			display: flex;
+			text-align: center;
+
+			&--left {
+				flex: 1;
+				padding: 30rpx 20rpx;
+				background-color: $uni-bg-color;
+				margin-right: 20rpx;
+				border-radius: $uni-border-radius-base;
+			}
+
+			&--right {
+				flex: 3;
+				display: flex;
+				justify-content: space-around;
+				padding: 30rpx 20rpx;
+				background-color: $uni-bg-color;
+				border-radius: $uni-border-radius-base;
+
+				.line {
+					width: 2rpx;
+					height: 65%;
+					margin-top: 35rpx;
+					background-color: #f5f5f5;
+				}
+			}
+		}
+
+		&__note {
+			margin: 30rpx 0;
+		}
+
+		/* 工具 */
+		&__tools {
+			padding: 20rpx 10rpx;
+			background-color: $uni-bg-color;
+			border-radius: $uni-border-radius-base;
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+				display: block;
+				margin: 15rpx 0 25rpx 0;
+			}
+		}
+	}
+
+	::v-deep .u-cell__title-text {
+		border: 0;
+		font-weight: bold;
+		font-size: 36rpx;
+	}
+</style>

src/pages.json

@@ -1,420 +1,429 @@
-{
-  "easycom": {
-    "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-  },
-  "pages": [
-    {
-      "path": "pages/tabbar/home",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/login/login",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/login/phoneLogin",
-      "style": {
-        "navigationBarTitleText": "账号登录"
-      }
-    },
-    {
-      "path": "pages/webview/index",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/tabbar/community",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": true,
-        "onReachBottomDistance": 50
-      }
-    },
-    {
-      "path": "pages/tabbar/message",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/mine",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/promotionCode",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom"
-      }
-    }
-  ],
-  "subPackages": [
-    {
-      "root": "pagesHome",
-      "pages": [
-        {
-          "path": "homeSearch",
-          "style": {
-            "navigationBarTitleText": "商品搜索"
-          }
-        },
-        {
-          "path": "home/popularRecommend",
-          "style": {
-            "navigationBarTitleText": "热门推荐"
-          }
-        },
-        {
-          "path": "home/nearbyBusiness",
-          "style": {
-            "navigationBarTitleText": "附近商家"
-          }
-        },
-        {
-          "path": "marketer/index",
-          "style": {
-            "navigationBarTitleText": "商家详情"
-          }
-        },
-        {
-          "path": "marketer/productDetail",
-          "style": {
-            "navigationBarTitleText": "商品详情"
-          }
-        },
-        {
-          "path": "marketer/settleOrder",
-          "style": {
-            "navigationBarTitleText": "结算订单"
-          }
-        },
-        {
-          "path": "marketer/settleStatus",
-          "style": {
-            "navigationBarTitleText": "结算状态"
-          }
-        },
-        {
-          "path": "category/index",
-          "style": {
-            "navigationBarTitleText": "商品类型"
-          }
-        },
-        {
-          "path": "category/categoryStoreList",
-          "style": {
-            "navigationBarTitleText": "商品列表"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pagesCustomer",
-      "pages": [
-        {
-          "path": "communityPostReview",
-          "style": {
-            "navigationBarTitleText": "发布评论"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pagesMessage",
-      "pages": [
-        {
-          "path": "orderNotify",
-          "style": {
-            "navigationBarTitleText": "订单通知"
-          }
-        },
-        {
-          "path": "commentNotify",
-          "style": {
-            "navigationBarTitleText": "评论通知"
-          }
-        },
-        {
-          "path": "kudosNotify",
-          "style": {
-            "navigationBarTitleText": "点赞通知"
-          }
-        },
-        {
-          "path": "benefitsNotify",
-          "style": {
-            "navigationBarTitleText": "优惠福利"
-          }
-        }
-      ]
-    },
-    {
-      "root": "PageMine",
-      "pages": [
-        {
-          "path": "orderModules/index",
-          "style": {
-            "navigationBarTitleText": "我的订单"
-          }
-        },
-        {
-          "path": "orderModules/orderDetail",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "orderModules/orderComment",
-          "style": {
-            "navigationBarTitleText": "订单评价"
-          }
-        },
-        {
-          "path": "favourite",
-          "style": {
-            "navigationBarTitleText": "收藏列表"
-          }
-        },
-        {
-          "path": "shopCar",
-          "style": {
-            "navigationBarTitleText": "购物车"
-          }
-        },
-        {
-          "path": "coupon",
-          "style": {
-            "navigationBarTitleText": "优惠券列表"
-          }
-        },
-        {
-          "path": "goodsReserve",
-          "style": {
-            "navigationBarTitleText": "商品预约"
-          }
-        },
-        {
-          "path": "myTeam",
-          "style": {
-            "navigationBarTitleText": "我的团队"
-          }
-        },
-        {
-          "path": "serviceCenter/index",
-          "style": {
-            "navigationBarTitleText": "客服中心"
-          }
-        },
-        {
-          "path": "serviceCenter/serviceDetail",
-          "style": {
-            "navigationBarTitleText": "问题详情"
-          }
-        },
-        {
-          "path": "feedback",
-          "style": {
-            "navigationBarTitleText": "意见反馈"
-          }
-        },
-        {
-          "path": "aboutUs",
-          "style": {
-            "navigationBarTitleText": "关于我们"
-          }
-        },
-        {
-          "path": "setting/index",
-          "style": {
-            "navigationBarTitleText": "设置"
-          }
-        },
-        {
-          "path": "setting/personInformation",
-          "style": {
-            "navigationBarTitleText": "个人信息"
-          }
-        },
-        {
-          "path": "setting/aboutUs",
-          "style": {
-            "navigationBarTitleText": "关于我们"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pageMerchant",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "mineModule/personalInfo",
-          "style": {
-            "navigationBarTitleText": "店铺信息"
-          }
-        },
-        {
-          "path": "mineModule/storeEnviron",
-          "style": {
-            "navigationBarTitleText": "门店环境"
-          }
-        },
-        {
-          "path": "mineModule/openStoreAppealDetail",
-          "style": {
-            "navigationBarTitleText": "资质信息"
-          }
-        },
-        {
-          "path": "mineModule/certification/index",
-          "style": {
-            "navigationBarTitleText": "我要开店"
-          }
-        },
-        {
-          "path": "mineModule/certification/storeInformation",
-          "style": {
-            "navigationBarTitleText": "1/3门店信息"
-          }
-        },
-        {
-          "path": "mineModule/certification/corporateInformation",
-          "style": {
-            "navigationBarTitleText": "2/3法人信息"
-          }
-        },
-        {
-          "path": "mineModule/certification/qualificationInformation",
-          "style": {
-            "navigationBarTitleText": "2/3资质信息"
-          }
-        },
-        {
-          "path": "mineModule/certification/messageSubmit",
-          "style": {
-            "navigationBarTitleText": "审核信息"
-          }
-        },
-        {
-          "path": "mineModule/certification/openStoreAppealDetail",
-          "style": {
-            "navigationBarTitleText": "资质信息"
-          }
-        },
-        {
-          "path": "mineModule/setting/index",
-          "style": {
-            "navigationBarTitleText": "设置"
-          }
-        },
-        {
-          "path": "storeModule/appointList",
-          "style": {
-            "navigationBarTitleText": "预约列表"
-          }
-        },
-        {
-          "path": "storeModule/couponManage",
-          "style": {
-            "navigationBarTitleText": "商品优惠"
-          }
-        },
-        {
-          "path": "storeModule/evaluateBack",
-          "style": {
-            "navigationBarTitleText": "回复评价"
-          }
-        },
-        {
-          "path": "storeModule/evaluateManagement",
-          "style": {
-            "navigationBarTitleText": "评价管理"
-          }
-        },
-        {
-          "path": "storeModule/myTeam",
-          "style": {
-            "navigationBarTitleText": "我的团队"
-          }
-        },
-        {
-          "path": "storeModule/shopManage",
-          "style": {
-            "navigationBarTitleText": "店铺管理"
-          }
-        }
-      ]
-    }
-  ],
-  "tabBar": {
-    "color": "#999999",
-    "selectedColor": "#42b2fa",
-    "borderStyle": "black",
-    "list": [
-      {
-        "pagePath": "pages/tabbar/home",
-        "iconPath": "static/images/home.png",
-        "selectedIconPath": "static/images/home-select.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/tabbar/community",
-        "iconPath": "static/images/community.png",
-        "selectedIconPath": "static/images/community-select.png",
-        "text": "社区"
-      },
-      {
-        "pagePath": "pages/tabbar/promotionCode",
-        "iconPath": "static/images/rqcode.png",
-        "selectedIconPath": "static/images/rqcode-select.png",
-        "text": "推广"
-      },
-      {
-        "pagePath": "pages/tabbar/message",
-        "iconPath": "static/images/message.png",
-        "selectedIconPath": "static/images/message-select.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/tabbar/mine",
-        "iconPath": "static/images/mine.png",
-        "selectedIconPath": "static/images/mine-select.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "",
-        "path": "",
-        "query": ""
-      }
-    ]
-  }
-}
+{
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
+			"path": "pages/tabbar/home",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/phoneLogin",
+			"style": {
+				"navigationBarTitleText": "账号登录"
+			}
+		},
+		{
+			"path": "pages/webview/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/tabbar/community",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50
+			}
+		},
+		{
+			"path": "pages/tabbar/message",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/tabbar/mine",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/tabbar/promotionCode",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		}
+	],
+	"subPackages": [{
+			"root": "pagesHome",
+			"pages": [{
+					"path": "homeSearch",
+					"style": {
+						"navigationBarTitleText": "商品搜索"
+					}
+				},
+				{
+					"path": "home/popularRecommend",
+					"style": {
+						"navigationBarTitleText": "热门推荐"
+					}
+				},
+				{
+					"path": "home/nearbyBusiness",
+					"style": {
+						"navigationBarTitleText": "附近商家"
+					}
+				},
+				{
+					"path": "marketer/index",
+					"style": {
+						"navigationBarTitleText": "商家详情"
+					}
+				},
+				{
+					"path": "marketer/productDetail",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "marketer/settleOrder",
+					"style": {
+						"navigationBarTitleText": "结算订单"
+					}
+				},
+				{
+					"path": "marketer/settleStatus",
+					"style": {
+						"navigationBarTitleText": "结算状态"
+					}
+				},
+				{
+					"path": "category/index",
+					"style": {
+						"navigationBarTitleText": "商品类型"
+					}
+				},
+				{
+					"path": "category/categoryStoreList",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesCustomer",
+			"pages": [{
+				"path": "communityPostReview",
+				"style": {
+					"navigationBarTitleText": "发布评论"
+				}
+			}]
+		},
+		{
+			"root": "pagesMessage",
+			"pages": [{
+					"path": "orderNotify",
+					"style": {
+						"navigationBarTitleText": "订单通知"
+					}
+				},
+				{
+					"path": "commentNotify",
+					"style": {
+						"navigationBarTitleText": "评论通知"
+					}
+				},
+				{
+					"path": "kudosNotify",
+					"style": {
+						"navigationBarTitleText": "点赞通知"
+					}
+				},
+				{
+					"path": "benefitsNotify",
+					"style": {
+						"navigationBarTitleText": "优惠福利"
+					}
+				}
+			]
+		},
+		{
+			"root": "PageMine",
+			"pages": [{
+					"path": "orderModules/index",
+					"style": {
+						"navigationBarTitleText": "我的订单"
+					}
+				},
+				{
+					"path": "orderModules/orderDetail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "orderModules/orderComment",
+					"style": {
+						"navigationBarTitleText": "订单评价"
+					}
+				},
+				{
+					"path": "favourite",
+					"style": {
+						"navigationBarTitleText": "收藏列表"
+					}
+				},
+				{
+					"path": "shopCar",
+					"style": {
+						"navigationBarTitleText": "购物车"
+					}
+				},
+				{
+					"path": "coupon",
+					"style": {
+						"navigationBarTitleText": "优惠券列表"
+					}
+				},
+				{
+					"path": "goodsReserve",
+					"style": {
+						"navigationBarTitleText": "商品预约"
+					}
+				},
+				{
+					"path": "myTeam",
+					"style": {
+						"navigationBarTitleText": "我的团队"
+					}
+				},
+				{
+					"path": "serviceCenter/index",
+					"style": {
+						"navigationBarTitleText": "客服中心"
+					}
+				},
+				{
+					"path": "serviceCenter/serviceDetail",
+					"style": {
+						"navigationBarTitleText": "问题详情"
+					}
+				},
+				{
+					"path": "feedback",
+					"style": {
+						"navigationBarTitleText": "意见反馈"
+					}
+				},
+				{
+					"path": "aboutUs",
+					"style": {
+						"navigationBarTitleText": "关于我们"
+					}
+				},
+				{
+					"path": "setting/index",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "setting/personInformation",
+					"style": {
+						"navigationBarTitleText": "个人信息"
+					}
+				},
+				{
+					"path": "setting/aboutUs",
+					"style": {
+						"navigationBarTitleText": "关于我们"
+					}
+				}
+			]
+		},
+		{
+			"root": "pageMerchant",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "mineModule/personalInfo",
+					"style": {
+						"navigationBarTitleText": "店铺信息"
+					}
+				},
+				{
+					"path": "mineModule/storeEnviron",
+					"style": {
+						"navigationBarTitleText": "门店环境"
+					}
+				},
+				{
+					"path": "mineModule/openStoreAppealDetail",
+					"style": {
+						"navigationBarTitleText": "资质信息"
+					}
+				},
+				{
+					"path": "mineModule/certification/index",
+					"style": {
+						"navigationBarTitleText": "我要开店"
+					}
+				},
+				{
+					"path": "mineModule/certification/storeInformation",
+					"style": {
+						"navigationBarTitleText": "1/3门店信息"
+					}
+				},
+				{
+					"path": "mineModule/certification/corporateInformation",
+					"style": {
+						"navigationBarTitleText": "2/3法人信息"
+					}
+				},
+				{
+					"path": "mineModule/certification/qualificationInformation",
+					"style": {
+						"navigationBarTitleText": "2/3资质信息"
+					}
+				},
+				{
+					"path": "mineModule/certification/messageSubmit",
+					"style": {
+						"navigationBarTitleText": "审核信息"
+					}
+				},
+				{
+					"path": "mineModule/certification/openStoreAppealDetail",
+					"style": {
+						"navigationBarTitleText": "资质信息"
+					}
+				},
+				{
+					"path": "mineModule/setting/index",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "storeModule/appointList",
+					"style": {
+						"navigationBarTitleText": "预约列表"
+					}
+				},
+				{
+					"path": "storeModule/couponManage",
+					"style": {
+						"navigationBarTitleText": "商品优惠"
+					}
+				},
+				{
+					"path": "storeModule/evaluateBack",
+					"style": {
+						"navigationBarTitleText": "回复评价"
+					}
+				},
+				{
+					"path": "storeModule/evaluateManagement",
+					"style": {
+						"navigationBarTitleText": "评价管理"
+					}
+				},
+				{
+					"path": "storeModule/myTeam",
+					"style": {
+						"navigationBarTitleText": "我的团队"
+					}
+				},
+				{
+					"path": "storeModule/shopManage",
+					"style": {
+						"navigationBarTitleText": "店铺管理"
+					}
+				},
+				{
+					"path": "storeModule/commodityWriteOff",
+					"style": {
+						"navigationBarTitleText": "商品核销"
+					}
+				},
+				{
+					"path" : "storeModule/components/queryWriteOff",
+					"style" : 
+					{
+						"navigationBarTitleText" : "查询核销"
+					}
+				},
+				{
+					"path" : "storeModule/components/verificationList",
+					"style" : 
+					{
+						"navigationBarTitleText" : "核销记录"
+					}
+				}
+			]
+		}
+	],
+	"tabBar": {
+		"color": "#999999",
+		"selectedColor": "#42b2fa",
+		"borderStyle": "black",
+		"list": [{
+				"pagePath": "pages/tabbar/home",
+				"iconPath": "static/images/home.png",
+				"selectedIconPath": "static/images/home-select.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/tabbar/community",
+				"iconPath": "static/images/community.png",
+				"selectedIconPath": "static/images/community-select.png",
+				"text": "社区"
+			},
+			{
+				"pagePath": "pages/tabbar/promotionCode",
+				"iconPath": "static/images/rqcode.png",
+				"selectedIconPath": "static/images/rqcode-select.png",
+				"text": "推广"
+			},
+			{
+				"pagePath": "pages/tabbar/message",
+				"iconPath": "static/images/message.png",
+				"selectedIconPath": "static/images/message-select.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/tabbar/mine",
+				"iconPath": "static/images/mine.png",
+				"selectedIconPath": "static/images/mine-select.png",
+				"text": "我的"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"condition": {
+		"current": 0,
+		"list": [{
+			"name": "",
+			"path": "",
+			"query": ""
+		}]
+	}
+}

src/pages/tabbar/components/TapList.vue

@@ -61,7 +61,7 @@
             id: '3',
             icon: 'share-square',
             title: '意见反馈',
-            url: '/PageMine/feedback',
+            url: '/PageMine/feedback?channelType=0',
             isLink: true,
           },
           {

src/pages/tabbar/mine.vue

@@ -25,7 +25,7 @@
 					</view>
 				</view>
 				<!-- 列表 -->
-				<view class="Collect">
+				<!-- <view class="Collect">
 					<u-grid :border="false" col="4">
 						<u-grid-item v-for="(listItem, listIndex) in collectList" :key="listIndex"
 							@tap="$Router.push(listItem.url)">
@@ -34,9 +34,9 @@
 							<text class="grid-text">{{ listItem.title }}</text>
 						</u-grid-item>
 					</u-grid>
-				</view>
+				</view> -->
 				<!-- 订单 -->
-				<view class="order-out-box">
+				<!-- <view class="order-out-box">
 					<view class="order-inner-box">
 						<u-grid :border="false" col="4" style="background-color: #fff">
 							<u-grid-item v-for="(listItem, listIndex) in oderList" :key="listIndex"
@@ -46,7 +46,7 @@
 							</u-grid-item>
 						</u-grid>
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<!-- 我的收益 -->

src/utils/request.js

@@ -13,7 +13,8 @@ import {
 const instance = axios.create({
   baseURL: 'https://test.api.chelvc.com',
   // baseURL: "http://192.168.68.77:11000",
-  // baseURL: "https://358175z5l5.yicp.fun",
+  // baseURL: "https://358175z5l5.yicp.fun",
+  // baseURL: "http://localhost:11000",
   timeout: 10000,
   adapter: UniAdapter,
 });