commit -m 增加非订单其他二级类型

filters/filters.js

@@ -27,17 +27,16 @@ export function formatStateType(value) {// 收款状态： 1待确认、2已确
     }
     return map[value]
 }
-export function formatNewReceiptType(value) {// 非订单类别： 1上架费、2订单返佣、3认证通会员、4认证通企划
+export function formatNewReceiptType(value) {// 非订单类别： 1.上架费、2.订单返佣、3.认证通会员、4.认证通企划、5.其他
     const map = {
 	    1: '上架费',
 	    2: '服务返佣',
 	    3: '认证通会员',
 	    4: '认证通企划',
+	    5: '其他',
     }
     if (value) {
         return map[value]
-    }else{
-        return '其他'
     }
 }
 

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "app",
+    "name" : "caimei-applets-crm",
     "appid" : "__UNI__1EA8401",
     "description" : "绅钻服饰后台管理系统",
     "versionName" : "1.1.4",

pages/collection/list.vue

@@ -17,23 +17,30 @@
 				</view>
 			</view>
 			<view class="main day" v-if="currents == 0">
-				<view class="main-item tab" v-for="(item, index) in listTabsType" :key="index"
-					:class="{ tabActive: tabCurrents == index }" @click="tabClick(2, index, item.type)">
-					<view class="text">{{ item.name }}</view>
-				</view>
+				<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
+					<view class="main-item tab" v-for="(item, index) in listTabsType" :key="index"
+						:class="{ tabActive: tabCurrents == index }" @click="tabClick(2, index, item.type)">
+						<view class="text">{{ item.name }}</view>
+					</view>
+				</scroll-view>	
 			</view>
 			<view class="main day" v-if="currents == 1">
-				<view class="main-item tab small" v-for="(item, index) in listNoTbasType" :key="index"
-					:class="{ tabActive: tabCurrents == index }" @click="tabClick(3, index, item.type)">
-					<view class="text">{{ item.name }}</view>
-				</view>
+				<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
+					<view class="main-item tab small" v-for="(item, index) in listNoTbasType" :key="index"
+						:class="{ tabActive: tabCurrents == index }" @click="tabClick(3, index, item.type)">
+						<view class="text">{{ item.name }}</view>
+					</view>
+				</scroll-view>	
 			</view>
 			<view class="main day" v-if="currents == 2 || currents == 3">
-				<view class="main-item tab" v-for="(item, index) in listReturnType" :key="index"
-					:class="{ tabActive: tabCurrents == index }" @click="tabClick(2, index, item.type)">
-					<view class="text">{{ item.name }}</view>
-				</view>
+				<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
+					<view class="main-item tab" v-for="(item, index) in listReturnType" :key="index"
+						:class="{ tabActive: tabCurrents == index }" @click="tabClick(2, index, item.type)">
+						<view class="text">{{ item.name }}</view>
+					</view>
+				</scroll-view>
 			</view>
+			
 		</view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="7"></tui-skeleton>
 		<view class="user-section" v-else :style="{
@@ -639,9 +646,10 @@
 		position: fixed;
 		z-index: 999;
 		border-radius: 0 0 10rpx 10rpx;
+
 		&.day {
 			background: #ffffff;
-			padding: 20rpx 24rpx;
+			padding: 20rpx 0rpx;
 			box-shadow: 0 10rpx 10rpx 0 rgba(86, 119, 252, 0.2);
 		}
 
@@ -658,10 +666,15 @@
 			height: 80rpx;
 
 			&.day {
-				height: 70rpx;
+				height: 80rpx;
 				box-sizing: border-box;
-				padding: 20rpx 0;
+				padding: 20rpx 10rpx;
 				border-top: 1px solid #efefef;
+				.scroll-view_H {
+					white-space: nowrap;
+					width: 100%;
+					height: 80rpx;
+				}
 			}
 
 			&.one {}
@@ -709,7 +722,7 @@
 						width: auto;
 						border-radius: 8rpx;
 						background: #f7f7f7;
-						margin: 0 10rpx;
+						margin: 0 5rpx;
 						padding: 0 18rpx;
 						.text {
 							width: 100%;

pages/collection/sms.vue

@@ -474,7 +474,9 @@ export default {
 		changeNumber(e) {
 			// 校验输入为数字
 			this.params.receiptAmount = this.handleReceiptAmount = this.checkedNumberVal(e.detail.value)
-			console.log('receiptAmount', this.params.receiptAmount)
+			if (this.isCheckedCharge) {
+				this.params.receiptAmount = (Number(this.params.receiptAmount)*100 + this.params.handlingFee*100)/100
+			}
 		},
 		handlingFeeNumber(e) {
 			// 校验输入为数字

pages/relation/nonorder/add.vue

@@ -218,6 +218,10 @@ export default {
 				{
 					name: '认证通企划',
 					value: 4
+				},
+				{
+					name: '其他',
+					value: 5
 				}
 			],
 			shopOrderTerxt:'',
@@ -313,7 +317,7 @@ export default {
 				this.$util.msg('请选择二级类别', 2000)
 				return
 			}
-			if (this.operateParams.newReceiptType === 1 || this.operateParams.newReceiptType === 3) {
+			if (this.operateParams.newReceiptType === 3 || this.operateParams.newReceiptType === 4) {
 				if(this.operateParams.shopId === '' ){
 					this.$util.msg('请选择供应商', 2000)
 					return

pages/relation/nonorder/list.vue

@@ -27,7 +27,7 @@
 						v-model="listQuery.keyWord"
 						confirm-type="search"
 						@confirm="subMitSearch()"
-						placeholder="请输入供应商名称"
+						placeholder="搜索供应商名称 / 主订单ID"
 					/>
 					<text class="iconfont icon-sousuo"></text>
 				</view>

utils/config.tabs.js

@@ -26,7 +26,8 @@ export const listNoTbasType = [
     {name: '上架费',type: 1},
     {name: '服务返佣',type: 2},
     {name: '认证通会员',type: 3},
-    {name: '认证通企划',type: 4}
+    {name: '认证通企划',type: 4},
+    {name: '其他',type: 5}
 ]
 //收款状态：0全部 1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
 export const listReturnType = [