红包 退款

ghsApp/src/admin/home/workbench.vue

@@ -17,7 +17,7 @@
 					</div>
 				</navigator>
 				<div class="info-list">
-					<div class="info-list-name">新客</div>
+					<div class="info-list-name">访客</div>
 					<div class="info-list-value">
 						{{ $util.numberFormat(data.todayData.custom) || 0 }}
 					</div>
@@ -234,7 +234,7 @@ export default {
 					value: 0
 				},
 				{
-					name: "总访问",
+					name: "总访客",
 					value: 0
 				},
 				{

ghsApp/src/admin/shopYeChange/list.vue

@@ -8,7 +8,7 @@
 					<t-th>可提现余额</t-th>
 					<t-th>总余额</t-th>
 				</t-tr>
-				<view v-for="(item, index) in list.data" :key="index">
+				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 					<t-tr>
 						<t-td align="center" color="info"><view style="width:200rpx;">{{ item.event }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ parseFloat(item.amount) }}</view></t-td>
@@ -40,24 +40,21 @@ export default {
 	},
 	methods: {
 		async init(){
-			uni.showLoading({title: '加载中'})
-			try {
-				const res = await changeList({
-					page:this.list.page,tx:0
-				})
-				if (this.$util.isEmpty(res.data.list)){
-					this.completes(res)
-					return
-				}
-				let currentList = res.data.list
-				currentList.forEach(function(item,index,array){
-					array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
-				});
-				res.data.list = currentList
+			const res = await changeList({
+				page:this.list.page,tx:0
+			})
+			if (this.$util.isEmpty(res.data.list)){
 				this.completes(res)
-              } finally {
-                 uni.hideLoading(); 
-              }
+				return
+			}
+			let currentList = res.data.list
+			currentList.forEach(function(item,index,array){
+				array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
+			});
+			res.data.list = currentList
+			this.completes(res)
+		},
+		goDetail(item){
 		}
 	},
 	async onPullDownRefresh() {

ghsApp/src/pagesOrder/detail.vue

@@ -52,7 +52,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>支付方式：</view>
-					<view v-if="detailInfo.status != 1 && detailInfo.status!=5">{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
+					<view v-if="detailInfo.status != 1 && detailInfo.status!=5">{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'未知' }}</view>
 					<view v-else>--</view>
 				</view>
 				<view class="order-info_box">

ghsApp/src/pagesOrder/refund.vue

@@ -97,7 +97,7 @@
 						<!--<view class="flex list-title" @tap="selectProduct(i)">-->
 						<view class="flex list-title" >
 							<!--<view class="flex-center radioBtn" :class="res.isActive?'active':''"></view>-->
-							{{res.name}} {{ `${res.bigNum}/${res.smallNum}` }} 单价 {{`￥${res.discountPrice}`}}
+							{{res.name}} {{ `${res.bigNum}/${res.smallNum}` }} {{`￥${res.price}`}}
 						</view>
 						<view class="flex list-val">
 							<input type="number" @blur="inputFun" v-model="res.big"><text>扎</text>
@@ -167,9 +167,9 @@ export default {
 			this.refundPrice = 0
 			if(!this.$util.isEmpty(this.product)){
 				this.product.forEach(ele=>{
-					let unitPrice = ele.discountPrice; //单价
+					let unitPrice = ele.unitPrice; //单价
 					let big = ele.big * unitPrice; //输入的扎
-					let small = (ele.small * ele.discountSmallPrice).toFixed(2); //输入的支
+					let small = (ele.small * ele.smallUnitPrice).toFixed(2); //输入的支
 					this.refundPrice = (Number(this.refundPrice) + big + Number(small)).toFixed(2);
 				})
 			}

hdApp/src/admin/home/workbench.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-main app-content">
-    <!-- 用户信息 -->
+
     <div class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home.png)` }">
       <div class="user-top">
         <div class="app-size-28">今日概况</div>
@@ -33,21 +33,6 @@
         </div>
       </div>
     </div>
-    <!-- 订单总览 -->
-    <div class="module-com order-wrap">
-      <div class="total-blo">
-        <div
-          class="total-list"
-          v-for="(item, index) in orderData"
-          :key="index"
-          @click="pageTo(item)"
-        >
-          <div class="list-num">{{ item.value }}</div>
-          <div class="app-color-3">{{ item.name }}</div>
-        </div>
-      </div>
-    </div>
-    <!-- 消息 -->
     <div class="module-com news-wrap">
       <div
         class="news-list"
@@ -106,8 +91,8 @@
         </div>
       </div>
     </div>
-    <!-- <fab-module /> -->
-    <!-- 续费遮罩层 -->
+
+    <!-- 续费遮罩 -->
     <modal-module
       :show="renewMask"
       :custom="true"
@@ -241,7 +226,7 @@ export default {
           value: 0
         },
         {
-          name: "总访问",
+          name: "总访客",
           value: 0
         },
         {
@@ -538,4 +523,4 @@ export default {
     font-size: 34px;
   }
 }
-</style>
+</style>

hdApp/src/pagesPurchase/purDetails.vue

@@ -83,12 +83,12 @@
 
       </view>
 
-      <view class="bills-info_box content-box">
+      <view v-if="detailInfo.debt == 1 || detailInfo.clearId > 0" class="bills-info_box content-box">
         <view class="order-info_box" v-if="detailInfo.debt == 1">
           <view>欠款状态：</view>
             <view>是</view>
             <view class="price">
-              <text v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" style="margin-right:38rpx;color:#3385FF;font-size:26rpx;">全部欠款</text>
+              <!-- <text v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" style="margin-right:38rpx;color:#3385FF;font-size:26rpx;">全部欠款</text> -->
               <button @click="settleOrder(detailInfo.id,detailInfo.supplierId)" class="admin-button-com">结帐</button>
             </view>
         </view>
@@ -98,7 +98,6 @@
             <view class="price" v-if="detailInfo.clearId > 0">
               <button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看帐单</button>
             </view>
-						<view v-if="detailInfo.clearId == 0">--</view>          
         </view>
       </view>
 

hdApp/src/pagesStore/me/shopYeChange.vue

@@ -40,27 +40,21 @@ export default {
 	},
 	methods: {
 		async init(){
-			uni.showLoading({title: '加载中'})
-			try {
-				const res = await changeList({
-					page:this.list.page,tx:0
-				})
-				if (this.$util.isEmpty(res.data.list)){
-					this.completes(res)
-					return
-				}
-				let currentList = res.data.list
-				currentList.forEach(function(item,index,array){
-					array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
-				});
-				res.data.list = currentList
-			   	this.completes(res)
-              } finally {
-                 uni.hideLoading(); 
-              }
+			const res = await changeList({
+				page:this.list.page,tx:0
+			})
+			if (this.$util.isEmpty(res.data.list)){
+				this.completes(res)
+				return
+			}
+			let currentList = res.data.list
+			currentList.forEach(function(item,index,array){
+				array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
+			});
+			res.data.list = currentList
+			this.completes(res)
 		},
 		goDetail(item){
-			console.log('item',item)
 			if(item.capitalType && item.capitalType == 11){
 				this.$util.pageTo({url: "/pagesPurchase/purDetails",query: {id:item.relateId}});
 			}