优化

ghsApp/src/admin/home/apply.vue

@@ -42,7 +42,7 @@ export default {
                     title:'统计',
                     list:[
                         {name: "利润表",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/profit"},
-                        {name: "收入统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/kdIncome"},
+                        {name: "收入渠道",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/kdIncome"},
                         {name: "花材销售榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/productSale"},
                         {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/customSale"},
                         {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/statistics/cgStat"},

ghsApp/src/admin/statistics/kdIncome.vue

@@ -23,7 +23,7 @@
 					</t-table>
 				</block>
 			</view>
-			<view class="act-income">实际收入：¥{{income}}</view>
+			<view class="act-income">扣除退款后收入：¥{{income}}</view>
 		</view>
 	</view>
 </view>

ghsApp/src/components/module/dateSelect.vue

@@ -11,6 +11,16 @@
         <view class="select-mark-view" v-show="dropdownShow" @click="switchCut"></view>
         <view v-if="dropdownShow" :style="{top}" class="select-fixed_bx">
             <slot>
+
+                <view class="select-item-box">
+                    <view class="title">按月份</view>
+                    <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
+                        <view class="item-child_box">
+                            <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
+                        </view>
+                    </picker>
+                </view>
+
                 <view class="select-item-box">
                     <view class="title">快捷</view>
                     <view class="item-child_box">
@@ -24,17 +34,6 @@
                     </view>
                 </view>
 
-
-                <view class="select-item-box">
-                    <view class="title">按月份</view>
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
-                        <view class="item-child_box">
-                            <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
-                        </view>
-                    </picker>
-                </view>
-
-
                 <view class="select-item-box">
                     <view class="title">自定义</view>
                     <view class="item-child_box" >

ghsApp/src/pages.json

@@ -207,7 +207,7 @@
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销售榜"}},
-				{"path": "kdIncome","style": {"navigationBarTitleText": "开单收入统计"}},
+				{"path": "kdIncome","style": {"navigationBarTitleText": "收入渠道"}},
 				{"path": "customSale","style": {"navigationBarTitleText": "客户下单排行"}},
 				{"path": "incomeStat","style": {"navigationBarTitleText": "应收款"}},
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},
@@ -284,7 +284,7 @@
 			"root": "pagesArrears",
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "客户欠款", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "欠款明细", "enablePullDownRefresh": true } }
+				{ "path": "details", "style": { "navigationBarTitleText": "欠账订单", "enablePullDownRefresh": true } }
 			]
 		},
 		{

ghsApp/src/pagesArrears/details.vue

@@ -138,6 +138,10 @@ export default {
 			this.payWay = this.payWayList[index].id
 		},
 		isModelFun(){
+			if(this.searchTime == ''){
+				this.$msg('请选择月份')
+				return false
+			}
 			if (this.$util.isEmpty(this.selectList)) {
 				this.$msg("请选择订单");
 				return;

ghsApp/src/pagesOrder/detail.vue

@@ -89,7 +89,7 @@
 				<view>结算状态：</view>
 					<view v-if="detailInfo.clearId > 0">已结清</view>
 					<view class="price" v-if="detailInfo.clearId > 0">
-					<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看帐单</button>
+					<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
 					</view>
 					<view v-if="detailInfo.clearId == 0">--</view>          
 				</view>

ghsApp/src/pagesPurchase/info.vue

@@ -73,7 +73,7 @@
 				<view>结算状态：</view>
 					<view v-if="detailInfo.clearId > 0">已结清</view>
 					<view class="price" v-if="detailInfo.clearId > 0">
-					<button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看帐单</button>
+					<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>

hdApp/src/components/module/dateSelect.vue

@@ -11,8 +11,18 @@
         <view class="select-mark-view" v-show="dropdownShow" @click="switchCut"></view>
         <view v-if="dropdownShow" :style="{top}" class="select-fixed_bx">
             <slot>
+
+                <view class="select-item-box">
+                    <view class="title">按月份</view>
+                    <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
+                        <view class="item-child_box">
+                            <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
+                        </view>
+                    </picker>
+                </view>
+
                 <view class="select-item-box">
-                    <view class="title">时间</view>
+                    <view class="title">快捷</view>
                     <view class="item-child_box">
                         <button
                             v-for="(item,index) in getDictionariesInfo.dateDefaultOption"
@@ -24,15 +34,6 @@
                     </view>
                 </view>
 
-                <view class="select-item-box">
-                    <view class="title">按月份</view>
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
-                        <view class="item-child_box">
-                            <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
-                        </view>
-                    </picker>
-                </view>
-
                 <view class="select-item-box">
                     <view class="title">时间段</view>
                     <view class="item-child_box" >