新增card-type

src/pages/order/complete.vue

@@ -8,18 +8,19 @@
 		</view>
 		<view class="u-menu-wrap">
 			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
-			 :scroll-into-view="itemId">
-				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item" :class="[current == index ? 'u-tab-item-active' : '']"
-				 @tap.stop="swichMenu(index)">
+				:scroll-into-view="itemId">
+				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item"
+					:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
 					<text class="u-line-1">{{item.name}}</text>
 				</view>
 			</scroll-view>
-			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
+			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box"
+				@scroll="rightScroll">
 				<!-- <form-com :item="tabbar"></form-com> -->
 				<u-form :model="form" ref="uForm">
 					<template v-for="(groupItem,index) in tabbar">
 						<view class="class-item" :key="index">
-							<view class="title" >{{groupItem.name}}</view>
+							<view class="title">{{groupItem.name}}</view>
 							<view class="class-bd">
 								<u-form-item :label-width="0" :required="groupItem.required"
 									v-for="(item,itemIndex) in groupItem.foods" :key="itemIndex">
@@ -34,7 +35,7 @@
 					</template>
 				</u-form>
 				<!-- <xh-input></xh-input> -->
-<!-- 				<view class="page-view">
+				<!-- 				<view class="page-view">
 					<view class="class-item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
 						<view class="item-title">
 							<text>{{item.name}}</text>
@@ -53,10 +54,8 @@
 </template>
 <script>
 	import classifyData from '@/common/classify.data.js';
-	// import allComponents from '@/components/createCom/index.js'
-	// import XhInput from '@/components/createCom/XhInput.vue'
 	// import formCom from './components/formCom.vue'
-		import XhInput from '@/components/createCom/XhInput.vue'
+	import XhInput from '@/components/createCom/XhInput.vue'
 	export default {
 		data() {
 			return {
@@ -71,17 +70,17 @@
 				arr: [],
 				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
 				timer: null, // 定时器
-				
+
 			}
 		},
 		components: {
 			'xh-input': XhInput,
 		},
-		created(){
+		created() {
 			// console.log(allComponents,'allComponents')
 		},
 		onLoad() {
-			
+
 		},
 		onReady() {
 			this.getMenuItemTop()
@@ -89,12 +88,12 @@
 		methods: {
 			// 点击左边的栏目切换
 			async swichMenu(index) {
-				if(this.arr.length == 0) {
+				if (this.arr.length == 0) {
 					await this.getMenuItemTop();
 				}
 				if (index == this.current) return;
 				this.scrollRightTop = this.oldScrollTop;
-				this.$nextTick(function(){
+				this.$nextTick(function() {
 					this.scrollRightTop = this.arr[index];
 					this.current = index;
 					this.leftMenuStatus(index);
@@ -152,11 +151,11 @@
 					let selectorQuery = uni.createSelectorQuery();
 					selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
 						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
-						if(!rects.length) {
+						if (!rects.length) {
 							setTimeout(() => {
 								this.getMenuItemTop();
 							}, 10);
-							return ;
+							return;
 						}
 						rects.forEach((rect) => {
 							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
@@ -166,18 +165,18 @@
 					}).exec()
 				})
 			},
-			
+
 			// 右边菜单滚动
 			async rightScroll(e) {
 				this.oldScrollTop = e.detail.scrollTop;
-				if(this.arr.length == 0) {
+				if (this.arr.length == 0) {
 					await this.getMenuItemTop();
 				}
-				if(this.timer) return ;
-				if(!this.menuHeight) {
+				if (this.timer) return;
+				if (!this.menuHeight) {
 					await this.getElRect('menu-scroll-view', 'menuHeight');
 				}
-				setTimeout(() => { // 节流
+				this.timer = setTimeout(() => { // 节流
 					this.timer = null;
 					// scrollHeight为右边菜单垂直中点位置
 					let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
@@ -187,7 +186,7 @@
 						// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
 						if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
 							this.leftMenuStatus(i);
-							return ;
+							return;
 						}
 					}
 				}, 10)

src/plugins/uploader/index.js

@@ -26,11 +26,11 @@ let baseOptions = {
 let uploader = new request(baseOptions);
 
 // 添加获取七牛云token的方法
-uploader.getQnToken = function() {
+uploader.getQnToken = function(data) {
 	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
 	// console.log(uploader.get,'uploader.get')
 	return new Promise((resolve, reject) => {
-		uploader.post(baseOptions.qiniuUploadUrl).then(data => {
+		uploader.post(baseOptions.qiniuUploadUrl,data).then(data => {
 			/*
 			 *接口返回参数：
 			 *visitPrefix:访问文件的域名

src/plugins/uploader/request/upload/upload.js

@@ -82,9 +82,13 @@ export default class fileUpload extends request {
 				}
 			}
 			let qnRes = this.qiniuTokenObj
-			if(!qnRes){
-				qnRes = await this.getQnToken()
-				this.qiniuTokenObj = qnRes
+			if(!qnRes || qnRes.cardType !== requestInfo.cardType){
+				let params = {type:requestInfo.cardType || ''}
+				qnRes = await this.getQnToken(params)
+				this.qiniuTokenObj = {
+					cardType:'',
+					...qnRes
+				}
 			}
 			const parmas = JSON.parse(JSON.stringify(qnRes)) 
 			parmas.visitPrefix = ''