11

pages/index/index.vue

@@ -6,9 +6,11 @@
 				<view class="title-btn-d">
 					<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/returnList')">
 						<text>待退货</text>
+						<text v-if="waitCount.waitReturnCount > 0" class="red-circle">{{waitCount.waitReturnCount > 99 ? '99+' :waitCount.waitReturnCount}}</text>
 					</view>
 					<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/order?listStatus=6')">
 						<text>待配货</text>
+						<text v-if="waitCount.waitAddProductCount > 0" class="red-circle">{{waitCount.waitAddProductCount > 99 ? '99+' :waitCount.waitAddProductCount}}</text>
 					</view>
 					<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/addHangOrder')">
 						<text>挂单</text>
@@ -18,22 +20,13 @@
 					</view>
 					<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/waitStorage?inStorageStatus=0')">
 						<text>待入库</text>
+						<text v-if="waitCount.waitPurchaseCount > 0" class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text>
 					</view>
 				</view>
 			</view>
-
-			<!-- <u-notice-bar :text="list"></u-notice-bar> -->
-			<!-- <u-notice-bar mode="horizontal" :list="list"  :is-circular="false"></u-notice-bar> -->
 			<view class="contentPadding">
 				<view class="title">
-					<i class="iconfont icon-xiaoshouyuce"> 今日营收详情
-						<!-- <view class="btn">
-							待配货 >
-						</view> -->
-					</i>
-					<!-- <image src="../../static/images/tabbar/inve1.png" mode="widthFix"></image> -->
-
-
+					<i class="iconfont icon-xiaoshouyuce"> 今日营收详情</i>
 				</view>
 				<u-grid :col="2">
 					<u-grid-item>
@@ -67,11 +60,7 @@
 			</view>
 			<view class="contentPadding">
 				<view class="title">
-					<i class="iconfont icon-wenjianliebiao"> 近期订单列表
-						<!-- <view class="btn" @tap="gotoOrder">
-							历史订单 >
-						</view> -->
-					</i>
+					<i class="iconfont icon-wenjianliebiao"> 近期订单列表</i>
 				</view>
 				<ul class="inventoryList" v-if="inventoryList.length > 0">
 					<li v-for="item in inventoryList" :key="item.id">
@@ -108,7 +97,13 @@
 							<u-cell icon="integral-fill" url="/pages/index/waitStorage" title="采购单历史" clickable isLink
 								arrow-direction="left"></u-cell>
 							<u-cell icon="integral-fill" url="/pages/index/order?type=dingdan" title="销售单历史" clickable isLink
-								arrow-direction="left"></u-cell>
+								arrow-direction="left"></u-cell>
+								<u-cell icon="integral-fill" url="" title="物业费缴纳" clickable isLink
+									arrow-direction="left"></u-cell>
+									<u-cell icon="integral-fill" url="" title="电费缴纳" clickable isLink
+										arrow-direction="left"></u-cell>
+										<u-cell icon="integral-fill" url="" title="租金缴纳(已过期)" clickable isLink
+											arrow-direction="left"></u-cell>
 						</u-cell-group>
 					</view>
 				</view>
@@ -126,13 +121,7 @@
 	export default {
 		computed: mapState(['shopName', 'userId', 'shopIndex', 'avatar']),
 		data() {
-			return {
-				list: [
-					'1',
-					'22222',
-					'33333',
-					'34567'
-				],
+			return {
 				type:'',
 				src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
 				inventoryList: [],
@@ -175,9 +164,8 @@
 						}
 					},
 				},
-				shopInfo: {
-
-				}
+				shopInfo: {},
+				waitCount:{}
 			}
 		},
 		components: {
@@ -197,9 +185,19 @@
 			this.getSaleInfo()
 			this.getServerData();
 			this.getOrderInfoList();
-			
+			this.getWaitCount()
 		},
-		methods: {
+		methods: {
+			getWaitCount(){
+				this.tui.request("/app/sale/getWaitCount", "POST", {}, false, false).then((res) => {
+					if(res.code == 200){
+						this.waitCount = res.result
+					}else{
+						this.tui.toast(res.message)
+					}
+					
+				})
+			},
 			getSaleInfo() {
 				this.tui.request("/app/sale/getShopAll", "POST", {
 					shopId: this.shopIndex
@@ -386,6 +384,7 @@
 		flex: 1;
 		line-height: 80upx;
 		text-align: center;
+		position: relative;
 	}
 	.title-btn-sbtn:hover{
 		color: #B22222;
@@ -393,7 +392,19 @@
 	.title-btn-sbtn:nth-child(1),.title-btn-sbtn:nth-child(2){
 		border-right: 1px solid #fff;
 	}
-	
+	.red-circle{
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 22rpx;
+		border-radius: 50%;
+		background: red;
+		color: #fff;
+		text-align: center;
+	}
 </style>
 <style>
 	.u-cell__body {

pages/inventory/goodsList1.vue

@@ -1065,7 +1065,7 @@
 						province: this.khName.province,
 						payStatus: 1,
 						receiveAddress: this.khName.address,
-						userId: this.khName.userId,
+						userId: this.khName.id,
 						userName: this.khName.name,
 						transportType: this.radioType1 == 1 ? 2 : this.radioType, //this.radioType
 						discount: this.discountNum,

pages/other/logistics.vue

@@ -2,10 +2,7 @@
 	<view>
 		<view>
 			<button size="default" type="default" @tap="goAddPeople" hover-class="is-hover">上线</button>
-		</view>
-		<!-- <uni-section class="mb-10" title="历史订单" type="line">
-			<uni-datetime-picker style="margin-bottom:10px;" v-model="range" type="daterange" />
-		</uni-section> -->
+		</view>
 		<view class="contentPadding">
 			<view class="title">
 				<i class="iconfont icon-huaban"> 今日订单
@@ -37,16 +34,6 @@
 					</li>
 				</ul>
 			</view>
-			<!-- <u-cell-group>
-        <u-cell @click="onCellClick(item)" :label="item.createTime">
-          <view slot="title">
-            <view class="text">下单店铺：张三的店</view>
-            <view class="text">收货地址：北京市朝阳区十里河66号</view>
-            <view class="text">联系电话：13510521562</view>
-            <view class="text">物流人员：物流李四</view>
-          </view>
-        </u-cell>
-      </u-cell-group> -->
 		</view>
 		<u-modal :show="modalShow" title="详细地址" :content='content' @confirm="modalShow = false"></u-modal>
 	</view>