退款和库存

hdApp/src/admin/goodsManage/list.vue

@@ -59,7 +59,7 @@ import AppSearchModule from "@/components/module/app-search";
 import OperateModule from "@/admin/home/components/module/operate";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import ModalModule from "@/components/plugin/modal";
-import {categoryListB,getCategoryGoodsB,delB,changeStatusB} from "@/api/goods";
+import {categoryListB,getCategoryGoodsB} from "@/api/goods";
 import { list } from "@/mixins";
 export default {
   name: "list",
@@ -127,7 +127,7 @@ export default {
       });
     },
     getGoodsList() {
-      return getCategoryGoodsB({ status: 1, page: this.list.page, ...this.form }).then(res => {
+      return getCategoryGoodsB({ status:'', page: this.list.page, ...this.form }).then(res => {
         this.completes(res)
       })
     },
@@ -141,15 +141,6 @@ export default {
         this.resetList();
         this.getGoodsList();
       }
-    },
-    changeStatus(item) {
-      let status = item.status == 0 ? 1 : 0
-      changeStatusB({id: item.id,status: status}).then(res => {
-        if(res.code == 1){
-          this.$msg("修改成功")
-          item.status = status
-        }
-      })
     }
   }
 };

hdApp/src/admin/goodsManage/stockChange.vue

@@ -7,15 +7,15 @@
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
 							<t-th>时间</t-th>
-							<t-th><view style="width:180upx;">事项</view></t-th>
 							<t-th>名称</t-th>
+							<t-th><view style="width:180upx;">事项</view></t-th>
 							<t-th>变动</t-th>
 							<t-th>剩余</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
 							<t-td><view>{{ item.addTime.substr(5,11) }}</view></t-td>
-							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
 							<t-td><view>{{item.relateName}}</view></t-td>
+							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
 							<t-td><view>{{parseFloat(item.goodsNum)}}</view></t-td>
 							<t-td><view>{{parseFloat(item.newStock)}}</view></t-td>
 						</t-tr>

hdApp/src/admin/home/components/order-item.vue

@@ -53,8 +53,8 @@ export default {
 		}
 		.list-msg {
 			color:#999999;
+			font-size: 28upx;
 			.title {
-				font-size: 28upx;
 				color: $fontColor2;
 				margin-bottom: 10upx;
 			}

hdApp/src/admin/home/order.vue

@@ -4,10 +4,10 @@
     <view class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
-          <view class="list-top flex-center-between">
-            <view class="app-color-3">编号：{{ item.sendNum }}</view>
-            <view style="border:1upx solid red;border-radius:10upx;font-size:15upx;color:red;padding:5upx 7upx;" v-if="item.refund == 1">有退款</view>
-            <view :class="['app-price',{'app-green':item.status==5}]">{{ item.status | constantfilter('ORDER_STATUS') }}</view>
+          <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
+            <view class="app-color-3" style="font-size:28upx;">编号：{{ item.sendNum }}</view>
+            <view style="border:1upx solid red;border-radius:16upx;font-size:16upx;color:red;padding:5upx 7upx;" v-if="item.refund == 1">有退款</view>
+            <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
           </view>
           <view class="list-blo">
               <orderItem :info="item"></orderItem>
@@ -190,7 +190,6 @@ export default {
       margin-bottom: 20upx;
       .list-top,.list-bottom {
         padding: 20upx 0;
-        border-bottom: 1px solid #EEEEEE;
         color: #999999;
         .app-bold {
           color: #333;
@@ -209,7 +208,8 @@ export default {
         .list-button {
           margin-top: 26upx;
           .admin-button-com {
-            margin-left: 20upx;
+            margin-left: 50upx;
+            padding:20upx 30upx;
           }
         }
       }

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

@@ -21,7 +21,7 @@
 		</view>
 	</view>
 	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">销售记录</text>
-	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
+	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存变动</text>
 	<!-- #ifdef MP-WEIXIN -->
 	<!-- <text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text> -->
 	<!-- #endif -->

hdApp/src/admin/order/detail.vue

@@ -126,7 +126,7 @@ export default {
   methods: {
 		goRefund(){
 			if(this.orderInfo.payWay == 1){
-				this.$msg('支付宝订单暂不支持退款，请线下退款')
+				this.$msg('支付宝订单暂不支持线上退款')
 				return false
 			}
 			this.$util.pageTo({url:'/admin/order/refund?id='+this.option.id})

hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -7,15 +7,15 @@
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
 							<t-th>时间</t-th>
-							<t-th><view style="width:180upx;">事项</view></t-th>
 							<t-th>名称</t-th>
+							<t-th><view style="width:180upx;">事项</view></t-th>
 							<t-th>变动</t-th>
 							<t-th>剩余</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
 							<t-td><view>{{ item.addTime.substr(5,11) }}</view></t-td>
-							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
 							<t-td><view>{{item.relateName}}</view></t-td>
+							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
 							<t-td><view>{{parseFloat(item.itemNum)}}</view></t-td>
 							<t-td><view>{{parseFloat(item.newStock)}}</view></t-td>
 						</t-tr>