解决冲突 合并代码

ghsApp/src/admin/home/order.vue

@@ -198,7 +198,7 @@ export default {
         {
           name: "已完成",
           value: 0,
-          id: 6,
+          id: 4,
         },
       ],
       selectItemId: "",

ghsApp/src/pagesOrder/detail.vue

@@ -43,13 +43,9 @@
 					</view>
 				</view>
 				<view class="order-info_box">
-					<view>销售人员：</view>
-					<view>{{ detailInfo.adminName }}</view>
+					<view>开单：</view>
+					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
-				<!-- <view class="order-info_box">
-                  <view>销售部门：</view>
-                  <view>2020 11-22</view>
-              </view> -->
 				<view class="order-info_box">
 					<view>出货日期：</view>
 					<view>{{ detailInfo.outTime }}</view>
@@ -58,14 +54,15 @@
 					<view>欠款：</view>
 					<view>{{ detailInfo.debt==1?'是':'-' }}</view>
 				</view>
+				<view class="order-info_box">
+					<view>配送方式：</view>
+					<view>{{ detailInfo.sendType==1?'待确认':detailInfo.sendType==2?'自取':detailInfo.sendType==3?'本店送':detailInfo.sendType==4?'快递配送':'未知' }}</view>
+				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
-				<!-- <view class="order-info_box">
-                  <view>销售门店：</view>
-                  <view>2020 11-22</view>
-              </view> -->
+
 			</view>
 			<view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">
 				<view> 配送进展：<text>{{ detailInfo.expressProgress.progressName }}</text> </view>

ghsApp/src/pagesStatistics/business.vue

@@ -58,10 +58,7 @@
 				</view>
 				<view class="space-right">
 					<view class="show-item">
-						<view class="show-name"
-							>库存预警数
-							<text class="iconfont iconchangjianwentixiangguanwenti2"></text
-						></view>
+						<view class="show-name">库存预警数</view>
 						<view class="show-value red">{{baseInfo.stockWarning}}</view>
 					</view>
 				</view>

hdApp/src/pagesStatistics/business.vue

@@ -58,10 +58,7 @@
 				</view>
 				<view class="space-right">
 					<view class="show-item">
-						<view class="show-name"
-							>库存预警数
-							<text class="iconfont iconchangjianwentixiangguanwenti2"></text
-						></view>
+						<view class="show-name">库存预警数</view>
 						<view class="show-value red">{{baseInfo.stockWarning}}</view>
 					</view>
 				</view>

mallApp/src/pages/class/index.vue

@@ -2,11 +2,11 @@
   <view class="app-content classPage">
     <view class="class_info">
       <view class="class_details">
-        <text class="flower_name">专业花店</text>
-        <text class="flower_price">¥6800.00</text>
+        <text class="flower_name">{{pageData.name}}</text>
+        <text class="flower_price">¥{{pageData.price}}</text>
       </view>
       <view class="class_intro">
-        <text class="_intro">针对有想法的人</text>
+        <text class="_intro">{{pageData.target}}</text>
         <text class="_intro">×1</text>
       </view>
     </view>
@@ -53,11 +53,13 @@ export default{
           nickname: ''
         }
       },
-      orderSn: ''
+      orderSn: '',
+      pageData: {}
     }
   },
   onLoad(option) {
     this.dataList.form.classId = option.id
+    this.pageData = option
   },
   methods: {
     confirm(){

mallApp/src/pages/home/course.vue

@@ -2,18 +2,28 @@
 <template>
   <view class="app_content">
     <scroll-view class="course_list" scroll-y>
-      <view class="list_item" v-for="(item, index) in 8" :key="index">
-        <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fi1.sinaimg.cn%2FIT%2F2010%2F0419%2F201041993511.jpg&refer=http%3A%2F%2Fi1.sinaimg.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1621152651&t=08594a9b7bc95600bd5134c8be7f1150"></image>
-        <view class="class_name">婚礼宴会设计班</view>
-        <view class="class_introduce">针对花店花艺师，有一定花艺基础的花艺从业者</view>
+      <block v-if="!$util.isEmpty(pageList)">
+        <view class="list_item" v-for="(item, index) in pageList" :key="index" >
+        <image :src="item.cover"></image>
+        <view class="class_name">{{item.name}}</view>
+        <view class="class_introduce">{{item.target}}</view>
         <view class="class_price">
-          <text>¥6800.00</text>
+          <text>¥{{item.tuition}}</text>
           <view class="class_apply">
-            <text>600人报名</text>
-            <view class="apply_btn" @click="signUp">报名</view>
+            <text>{{item.num}}人报名</text>
+            <view class="apply_btn" @click="signUp(item)">报名</view>
           </view>
         </view>
       </view>
+      </block>
+      <block v-else>
+        <view class="nodata">
+          <view>
+            <image src="http://img.huaml.com/common/nodata.png"></image>
+            <view>暂无课程~</view>
+          </view>
+        </view>
+      </block>
     </scroll-view>
     <tab-bar
       :current="2"
@@ -23,20 +33,35 @@
 </template>
 
 <script>
+import AppWrapperEmpty from '@/components/app-wrapper-empty'
+import { pxClassList } from '@/api/px-class/index'
 export default {
+  components: {
+		AppWrapperEmpty
+	},
   data() {
     return {
-      currentTabIndex: 2
+      currentTabIndex: 2,
+      pageList: []
     }
   },
+  mounted(){
+    this.pxClassList()
+  },
   methods: {
     tabClick (index) {
       this.currentTabIndex = index
     },
-    signUp() {
+    signUp(item) {
       uni.navigateTo({
-        url: '/pages/class/index'
+        url: '/pages/class/index?id=' + item.id + '&name=' + item.name + '&price=' + item.tuition + '&target=' + item.target
       })
+    },
+    pxClassList() {
+      pxClassList().then(res => {
+        console.log(res)
+        this.pageList = res.data.list
+      }).catch(err => {console.log(err)})
     }
   }
 }
@@ -114,4 +139,27 @@ export default {
     }
   }
 }
+.nodata{
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  &>view{
+    width: 318upx;
+    height: 326upx;
+    // background-color: pink;
+    &>image{
+      width: 318upx;
+      height: 256upx;
+      // background-color: green;
+    }
+    &>view{
+      font-size: 26px;
+      color: #999999;
+      text-align: center;
+      margin-top: 40upx;
+    }
+  }
+}
 </style>

pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.d4a01365.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.d4a01365.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.0a39ca07.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.0a39ca07.js"></script></body></html>

pt/src/constant/constant.js

@@ -91,7 +91,7 @@ const _CONST_MAP = {
 			value: 2
 		},
 		{
-			label: '审核未通过',
+			label: '未通过',
 			value: 3
 		},
 		{

pt/src/saas/shop/apply.vue

@@ -8,9 +8,15 @@
 
 			<!-- 审核 -->
 			<template #slot-apply="{scope}">
-				<template v-if="scope.row.status == 1 || scope.row.status == 3">
+
+				<template v-if="scope.row.status == 1">
 					<el-button type="text" @click="showModalFn(scope.row)">审核</el-button>
 				</template>
+
+				<template v-if="scope.row.status == 3">
+					<el-button type="text" @click="showModalFn(scope.row)">重审</el-button>
+				</template>
+
 			</template>
 		</x-crud>
 		<!-- 审核弹窗 -->