Merge branch 'debt2' into dev

ghsApp/src/admin/cp/cpDetail.vue

@@ -29,7 +29,6 @@
               {{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}
               <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="productData.auth == 1" mode="widthFix" style="width:38upx;height:38upx;display:inline-block;margin-left:10upx;"></image>
             </view>
-            <button v-if="productData.id > 0 && productData.auth == 0" class="admin-button-com blue mini-btn" @click="ptAuth(productData)">申请认证</button>
           </tui-list-cell>
   
           <tui-list-cell class="line-cell" :hover="false">

ghsApp/src/admin/cp/item.vue

@@ -81,9 +81,8 @@
                   <view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
                   <view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
                   <view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
-                  <view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享（批发）</button></view>
-                  <view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报（批发）</button></view>
-                  <view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报（零售）</button></view>
+                  <view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享</button></view>
+                  <view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">生成海报</button></view>
                   <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view>
                   <view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
                   <view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>

ghsApp/src/admin/home/workbench.vue

@@ -176,7 +176,7 @@
 			<div class="total-blo">
 				<div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
 					<div class="list-num">
-						<block v-if="item.name=='总赊账'">查看</block>
+						<block v-if="lookMoney == 0 && item.name=='总赊账'">0</block>
 						<block v-else>{{ $util.numberFormat(item.value) }}</block>
 					</div>
 					<div class="app-color-3">{{ item.name }}</div>
@@ -901,8 +901,8 @@ export default {
 			margin: 20upx 0upx;
 			border-right: 1upx solid $borderColor;
 			.list-num {
-				margin-bottom:8upx;
-				font-size:26upx;
+				margin-bottom: 8upx;
+				font-size: 36upx;
 				font-weight: bold;
 			}
 		}

ghsApp/src/admin/item/components/item2.vue

@@ -142,7 +142,7 @@ export default {
 	border:2upx solid #cccccc;
 	font-size:22upx;
 	border-radius: 20upx;
-	padding:10upx 16upx;
+	padding:17upx 16upx;
 	color:#aaa9a9;
 	flex: 1;
 	text-align: center;

ghsApp/src/admin/item/detail.vue

@@ -31,7 +31,6 @@
             {{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}
             <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="productData.auth == 1" mode="widthFix" style="width:38upx;height:38upx;display:inline-block;margin-left:10upx;"></image>
           </view>
-          <button v-if="productData.id > 0 && productData.auth == 0" class="admin-button-com blue mini-btn" @click="ptAuth(productData)">申请认证</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

ghsApp/src/admin/item/list.vue

@@ -98,9 +98,8 @@
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享（批发）</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报（批发）</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报（零售）</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">生成海报</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>

ghsApp/src/admin/item/list2.vue

@@ -104,24 +104,52 @@
 		</uni-popup>
 
 		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="moveToLose()">挪到处理区</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享（批发）</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报（批发）</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报（零售）</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="doWaste()">报损</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="doPart()">拆散</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view>
-				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
+			<view class="action-popup-container">
+				<view class="action-button-item">
+					<button class="action-button" @click="costChange()">成本变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="priceChange()">价格变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="varietyManage()">多颜色</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="copyCreate()">复制新建</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="moveToLose()">挪到处理区</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="shareItem()">打开分享</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="getHdPosterFn()">生成海报</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="orderRecord()">下单记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="onStockChange()">路上库存变动</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="preSell()">预售</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doWaste()">报损</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doPart()">拆散</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="delItem()">删除</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="sendStock()">分配库存</button>
+				</view>
+				<view class="action-button-item cancel">
+					<button class="action-button cancel" @click="closeRightShow()">取消</button>
+				</view>
 			</view>
 		</uni-popup>
 
@@ -615,18 +643,7 @@ export default {
 		.search-bar {
 			flex: 1;
 		}
-		.city-select {
-			display: flex;
-			flex-shrink: 0;
-			align-items: center;
-			margin-right: 15upx;
-			margin-left: 45upx;
-			background-color: #ffff;
-			.iconfont {
-				margin-left: 20upx;
-				font-size: 30upx;
-			}
-		}
+
 	}
 	.scroll-middle_bx {
 		flex: 1;
@@ -651,22 +668,10 @@ export default {
 			font-size: 26upx;
 			color: #444;
 			font-weight: 400;
-			.tag {
-				display: flex;
-				padding: 0 20upx;
-				align-items: center;
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 32upx;
-				background: #ff2842;
-				border-radius: 16upx;
-				color: #fff;
-				font-size: 20upx;
+			
+			&:last-child{
+				margin-bottom: 110upx;
 			}
-      &:last-child{
-        margin-bottom: 110upx;
-      }
 		}
 
 		.active {
@@ -698,31 +703,63 @@ export default {
 		font-weight: 600;
 		color: #666666;
 	}
-	.select-cmd_bx {
-		& .kc {
-			color: #999999;
-			font-size: 28upx;
-			font-weight: 400;
-			margin-bottom: 60upx;
-			text-align: center;
-			margin-top: 10upx;
-		}
-		& .num_bx {
-			display: flex;
-			align-items: center;
-			margin-bottom: 80upx;
-			& > input {
-				width: 212upx;
-				height: 80upx;
-				border: 1upx solid #dddddd;
-				border-radius: 4upx;
-				text-align: center;
-				margin-right: 24upx;
-			}
-		}
-	}
+
 }
 .class-popup-style{
 	z-index:999999;
 }
+
+.action-popup-container {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 24upx;
+	padding: 50upx 40upx 60upx 40upx;
+	max-height: 99vh;
+	overflow-y: auto;
+	width: 92vw;
+	max-width: 650upx;
+	margin: 0 auto;
+}
+
+.action-button-item {
+	&.cancel {
+		grid-column: 1 / -1;
+		margin-top: 30upx;
+	}
+}
+
+.action-button {
+	width: 100%;
+	height: 120upx;
+	border: 2upx solid #d0d7de;
+	border-radius: 16upx;
+	background: #ffffff;
+	color: #24292f;
+	font-size: 34upx;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-shadow: 0 4upx 12upx rgba(0, 0, 0, 0.1);
+	transition: all 0.15s ease;
+	line-height: 1.2;
+	
+	&:active {
+		background: #f6f8fa;
+		transform: scale(0.96);
+		border-color: #8c959f;
+	}
+	
+	&.cancel {
+		background: #f6f8fa;
+		color: #656d76;
+		border-color: #d0d7de;
+		font-size: 32upx;
+		
+		&:active {
+			background: #eaeef2;
+			border-color: #8c959f;
+		}
+	}
+}
 </style>

hdApp/src/admin/home/workbench.vue

@@ -113,10 +113,7 @@
         <div class="total-tit">总览</div>
         <div class="total-blo">
           <div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
-              <div class="list-num">
-                <block v-if="item.name=='总赊账'">查看</block>
-                <block v-else>{{ $util.numberFormat(item.value) }}</block>
-              </div>
+            <div class="list-num">{{ $util.numberFormat(item.value) }}</div>
             <div class="app-color-3">{{ item.name }}</div>
           </div>
         </div>

hdApp/src/admin/item/components/item2.vue

@@ -58,11 +58,15 @@
 			</view>
 		</view>
 	</view>
-	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
-	<text class="bottom-button" @click.stop="goToStockDetail(info)">库明细</text>
-	<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
-	<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
-	<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
+	
+	<view class="bottom-buttons-container">
+		<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
+		<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
+		<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
+		<text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>
+		<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
+	</view>
+
 </view>
 </template>
 <script>
@@ -126,15 +130,28 @@ export default {
 .product{
 	height:230upx;
 }
+.bottom-buttons-container{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	flex-wrap: nowrap;
+}
 .bottom-button{
 	font-weight:normal;
 	border:2upx solid #cccccc;
-	font-size:24upx;
+	font-size:22upx;
 	border-radius: 20upx;
-	padding:13upx 22upx 13upx 22upx;
-	margin:0 8upx 0 0;
-	float:right;
+	padding:17upx 16upx;
 	color:#aaa9a9;
+	flex: 1;
+	text-align: center;
+	margin: 0 4upx;
+	white-space: nowrap;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
 }
 .item-cmd_bx {
 	height:160upx;
@@ -211,11 +228,6 @@ export default {
 		& .num-open_bx {
 			display: flex;
 			align-items: center;
-			& .price {
-				font-size: 28upx;
-				color: #999999;
-				flex: 1;
-			}
 			& .open-bx {
 				font-size:23upx;
 				color:#333333;
@@ -229,9 +241,6 @@ export default {
 				text:nth-child(2){
 					font-weight:normal;
 				}
-				*.warn {
-					color: $redColor;
-				}
 			}
 		}
 	}

hdApp/src/admin/item/list2.vue

@@ -104,24 +104,52 @@
 		</uni-popup>
 
 		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="moveToLose()">挪到处理区</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享（批发）</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报（批发）</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="doWaste()">报损</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="doPart()">拆散</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
-				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view> -->
-				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
+			<view class="action-popup-container">
+				<view class="action-button-item">
+					<button class="action-button" @click="costChange()">成本变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="priceChange()">价格变动记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="varietyManage()">多颜色</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="copyCreate()">复制新建</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="moveToLose()">挪到处理区</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="shareItem()">打开分享</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="getHdPosterFn()">生成海报</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="orderRecord()">下单记录</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="onStockChange()">路上库存变动</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="preSell()">预售</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doWaste()">报损</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="doPart()">拆散</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="delItem()">删除</button>
+				</view>
+				<view class="action-button-item">
+					<button class="action-button" @click="sendStock()">分配库存</button>
+				</view>
+				<view class="action-button-item cancel">
+					<button class="action-button cancel" @click="closeRightShow()">取消</button>
+				</view>
 			</view>
 		</uni-popup>
 
@@ -613,18 +641,6 @@ export default {
 		.search-bar {
 			flex: 1;
 		}
-		.city-select {
-			display: flex;
-			flex-shrink: 0;
-			align-items: center;
-			margin-right: 15upx;
-			margin-left: 45upx;
-			background-color: #ffff;
-			.iconfont {
-				margin-left: 20upx;
-				font-size: 30upx;
-			}
-		}
 	}
 	.scroll-middle_bx {
 		flex: 1;
@@ -649,19 +665,6 @@ export default {
 			font-size: 26upx;
 			color: #444;
 			font-weight: 400;
-			.tag {
-				display: flex;
-				padding: 0 20upx;
-				align-items: center;
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 32upx;
-				background: #ff2842;
-				border-radius: 16upx;
-				color: #fff;
-				font-size: 20upx;
-			}
       &:last-child{
         margin-bottom: 110upx;
       }
@@ -696,31 +699,62 @@ export default {
 		font-weight: 600;
 		color: #666666;
 	}
-	.select-cmd_bx {
-		& .kc {
-			color: #999999;
-			font-size: 28upx;
-			font-weight: 400;
-			margin-bottom: 60upx;
-			text-align: center;
-			margin-top: 10upx;
-		}
-		& .num_bx {
-			display: flex;
-			align-items: center;
-			margin-bottom: 80upx;
-			& > input {
-				width: 212upx;
-				height: 80upx;
-				border: 1upx solid #dddddd;
-				border-radius: 4upx;
-				text-align: center;
-				margin-right: 24upx;
-			}
-		}
-	}
 }
 .class-popup-style{
 	z-index:999999;
 }
+
+.action-popup-container {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 24upx;
+	padding: 50upx 40upx 60upx 40upx;
+	max-height: 99vh;
+	overflow-y: auto;
+	width: 92vw;
+	max-width: 650upx;
+	margin: 0 auto;
+}
+
+.action-button-item {
+	&.cancel {
+		grid-column: 1 / -1;
+		margin-top: 30upx;
+	}
+}
+
+.action-button {
+	width: 100%;
+	height: 120upx;
+	border: 2upx solid #d0d7de;
+	border-radius: 16upx;
+	background: #ffffff;
+	color: #24292f;
+	font-size: 34upx;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-shadow: 0 4upx 12upx rgba(0, 0, 0, 0.1);
+	transition: all 0.15s ease;
+	line-height: 1.2;
+	
+	&:active {
+		background: #f6f8fa;
+		transform: scale(0.96);
+		border-color: #8c959f;
+	}
+	
+	&.cancel {
+		background: #f6f8fa;
+		color: #656d76;
+		border-color: #d0d7de;
+		font-size: 32upx;
+		
+		&:active {
+			background: #eaeef2;
+			border-color: #8c959f;
+		}
+	}
+}
 </style>

hdApp/src/admin/order/detail.vue

@@ -87,19 +87,6 @@
         <view class="module-det">
           <view class="order-msg-blo">
 
-            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.remainDebtPrice)>0">
-              <view class="label">订金：</view>
-              <view class="value">￥{{dj}}</view>
-            </view>
-            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0" style="position:relative;">
-              <view class="label" style="color:red;">欠款：</view>
-              <view class="value" style="color:red;font-weight:bold;">
-                ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
-                <text v-if="Number(orderInfo.remainDebtPrice)<=0" style="margin-left:20upx;">已结清</text>
-                </view>
-              <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:absolute;right:0upx;top:0;border:1upx solid red;color:red;">结清</button>
-            </view>
-
             <view class="msg-list">
               <view class="label">状态：</view>
               <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待收货':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
@@ -115,16 +102,45 @@
             </view>
             <view class="msg-list" v-if="orderInfo.payStatus == 1">
               <view class="label">方式：</view>
+              <block v-if="orderInfo.payWay==3">
+                <view class="value" v-if="Number(orderInfo.remainDebtPrice)>0" style="color:red;font-weight:bold;">
+                  赊账
+                </view>
+                <view v-else class="value"  style="color:#3385ff;font-weight:bold;">
+                  赊账<text>（已结清）</text>
+                </view>
+              </block>
+              <view class="value" v-else>
+                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==2?'余额':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' :'其它'}}
+                <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">（现金付了￥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }}）</text>
+              </view>
+            </view>
+            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.remainDebtPrice)>0">
+              <view class="label">订金：</view>
+              <view class="value">￥{{dj}}</view>
+            </view>
+            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0" style="position:relative;">
+              <view class="label">欠款：</view>
+              <view class="value" style="color:red;font-weight:bold;">
+                ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
+                </view>
+              <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:absolute;right:0upx;top:0;border:1upx solid red;color:red;">结清</button>
+            </view>
+
+            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.orderSettleList)">
+              <view class="label">账单：</view>
               <view class="value">
-                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==2?'余额':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' : orderInfo.payWay==3 ?'欠款':'其它'}}
-                <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">（现金付￥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }}）</text>
-                <text v-if="Number(orderInfo.settleId)>0" style="color:red;font-weight:bold;">（已结清）</text>
+                <text v-for="(osItem, osIndex) in orderInfo.orderSettleList" :key="osIndex" style="margin-right:10upx;color:#3385ff;" @click="goSettle(osItem)">
+                  {{ osItem.settleSn!=''? osItem.settleSn:'结账单'+(osIndex+1) }}
+                </text>
               </view>
             </view>
+
             <view class="msg-list">
               <view class="label">时间：</view>
               <view class="value">{{ orderInfo.addTime ? orderInfo.addTime.substr(5,11) : ''}}</view>
             </view>
+
             <view class="msg-list" v-if="orderInfo.status == 1">
               <view class="label">过期：</view>
               <view class="value">{{ orderInfo.deadline?orderInfo.deadline:''}}</view>
@@ -228,7 +244,9 @@ export default {
 						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
 						if(currentIndex > 0){
 							let payWay = inWay[currentIndex].id
-							confirmSettle({id:item.id,payWay:payWay}).then(res=>{
+              let arr = [{id:item.id}]
+              let str = JSON.stringify(arr)
+							confirmSettle({id:str,payWay:payWay,customId:item.customId}).then(res=>{
 								if(res.code == 1){
 									that.$msg('操作成功')
                   that.getDetailInfo()
@@ -278,6 +296,9 @@ export default {
         }
       })
     },
+    goSettle(item){
+      this.$util.pageTo({url:'/admin/settle/detail?id='+item.settleId})
+    },
     getCustomInfo(item){
       this.$util.pageTo({url:'/admin/member/detail?id='+item.customId})
     },

hdApp/src/admin/settle/detail.vue

@@ -68,14 +68,11 @@
 									<text class="item-name">{{ s.orderSn }} 时间 {{s.payTime ? s.payTime.substr(5,11):''}}</text>
 									<text class="item-price">
 										<text class="unit">¥</text>
-										<text class="price">{{ s.actPrice?parseFloat(s.actPrice):0 }}</text>
+										<text class="price">{{ s.actSettleAmount?parseFloat(s.actSettleAmount):0 }}</text>
 									</text>
 								</view>
 								<view class="info-line">
 									<text class="item-type">
-										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
-										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
-										<text style="margin-left:20upx;color:red;font-weight:bold;" v-if="Number(s.tkPrice)>0">已退款¥{{parseFloat(s.tkPrice)}}</text>
 									</text>
 									<text class="item-count" style="color: #3385ff;">查看明细</text>
 								</view>

mallApp/src/mixins/globalMixins.js

@@ -48,6 +48,9 @@ export default {
 		if (option.account) {
 			uni.setStorageSync('account', option.account)
 		}
+		if (option.hdId) {
+			uni.setStorageSync('hdId', option.hdId)
+		}
 
 		uni.setStorageSync('currentQuery', JSON.stringify(option))
 

mallApp/src/pages/home/recent.vue

@@ -109,6 +109,7 @@ export default {
       //0没有登录 1有登录
       loginStyle :0,
       activePopupIndex: -1, // 控制弹出菜单的显示
+      pageAction:{refresh:0}
     };
   },
   computed: {
@@ -129,6 +130,12 @@ export default {
       }else{
         this.loginStyle = 0
       }
+
+      if(this.pageAction.refresh == 1){
+        this.getMyHdList()
+        this.pageAction.refresh == 0
+      }
+
   },
   methods: {
     recharge (item) {

mallApp/src/pages/login/result.vue

@@ -38,6 +38,14 @@ export default {
       superWx:'',
       account:0
     }
+  },
+	onLoad(){
+
+		//返回上一页时刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.pageAction = {refresh:1}
+
   },
   methods: {
     openSuperWx(){

mallApp/src/plugins/luch-request_0.0.7/request.js

@@ -250,15 +250,18 @@ class Request {
 	}
 
 	get(url, data = {}, options = {}, config = {}) {
-		// options.url = url + common.queryData(data, true)
-		options.url = url + parse({...data,'account':uni.getStorageSync('account')})
+		let account = uni.getStorageSync('account') || 0;
+		let hdId = uni.getStorageSync('hdId') || 0;
+		options.url = url + parse({...data,'account':account,'hdId':hdId})
 		options.data = {}
 		options.method = 'GET'
 		return this.request(options, config)
 	}
 
 	post(url, data = {}, options = {}, config = {}) {
-		options.url = url+'?account='+uni.getStorageSync('account')
+		let account = uni.getStorageSync('account') || 0;
+		let hdId = uni.getStorageSync('hdId') || 0;
+		options.url = url+'?account='+account+'&hdId='+hdId
 		options.data = data
 		options.method = 'POST'
 		return this.request(options, config)