Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/uniapp-qxk

# Conflicts:
#	pages/index/index.vue
#	static/images/logo.png

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb35ef055a4dd8ad4",
+        "appid" : "wx1d5b6a2773c15b58",
         "setting" : {
             "urlCheck" : false
         },

packages/ratingQueryDetail/ratingQueryDetail.vue

@@ -23,6 +23,10 @@
           <text class="text_8">发行商</text>
           <text class="text_9">{{ details.sub_order.publisher }}</text>
         </view>
+		<view class="flex-row group_8">
+		  <text class="text_8">卡片限编</text>
+		  <text class="text_9">{{ details.sub_order.limit_num }}</text>
+		</view>
       </view>
       <view class="justify-between section_4">
         <view class="flex-col">
@@ -91,6 +95,7 @@
 		imageList(){
 			let list = [];
 			if(this.details.sub_order){
+				if(!this.details.sub_order.images_url) return list;
 				let count = this.details.sub_order.images_url.length;
 				list = this.details.sub_order.images_url;
 				

packages/sonpingDetail/expenseDetail.vue

@@ -4,12 +4,16 @@
       <view class="flex-col">
         <view class="flex-col section_2">
           <view class="justify-between">
-            <text class="text_2">费用合计</text>
-            <text class="text_3">¥{{ details.total }}</text>
+            <text class="text_2">订单费用</text>
+            <text class="text_3">¥{{ Number.parseFloat(details.total) + details.discount }}</text>
           </view>
           <view class="justify-between group_7">
             <text class="text_4">订单折扣</text>
-            <text class="text_5">{{ details.discount && details.discount > 0 ? details.discount +'折' : '无'  }}</text>
+            <text class="text_5" :class="details.discount && details.discount > 0 ? 'text_5_red':''">{{ details.discount && details.discount > 0 ? '- ¥' : ''  }}{{ details.discount && details.discount > 0 ? details.discount +'' : '无'  }}</text>
+          </view>
+		  <view class="justify-between group_7">
+		    <text class="text_2">费用合计</text>
+		    <text class="text_3">¥{{ details.total }}</text>
 		  </view>
         </view>
 		
@@ -17,10 +21,12 @@
 			<!-- <u-collapse @change="change" @close="close" @open="open" ref="myCollapse" > -->
 			<u-collapse :border="false" ref="myCollapse" :value="['Rating fee']">
 			    <u-collapse-item title="评级费用" :value="ratingFeeTotal" name="Rating fee" >
-			      <view class="u-collapse-content lf-row-between collapse-item-content" v-for="(item, index) in details.grading_cost" :key="index">
+<!-- 			      <view class="u-collapse-content lf-row-between collapse-item-content" v-for="(item, index) in details.grading_cost" :key="index">
 					  <view>{{ item.title }}</view>
 					  <view>¥{{ item.amount }}</view>
-				  </view>
+				  </view> -->
+				  <lf-table :Header="header" :Content="details.grading_cost" height="auto" width="100%" :showNumber="false" :border="false" headBgColor="transparent" v-if="$isRight(details.other)"></lf-table>
+				  
 			    </u-collapse-item>
 			</u-collapse>
 		</view>
@@ -107,11 +113,17 @@
 			details.other.forEach(item => {
 				item.total = new Bigc(item.num).times(item.amount).round(2, 0);
 			})
+			details.grading_cost.forEach(item => {
+				item.total = new Bigc(item.num).times(item.amount).round(2, 0);
+			})
 			this.details = details;
+			setTimeout(()=>{
 				this.$nextTick(()=>{
 					this.$refs.myCollapse.init();
 					this.$refs.myCollapse2.init();
 				});
+			},200)
+			
 			
 		}
 	}
@@ -215,6 +227,9 @@
     line-height: 44rpx;
     white-space: nowrap;
   }
+  .text_5_red{
+	  color: red;
+  }
   .text_18 {
     margin-left: 116rpx;
   }

packages/sonpingDetail/sonpingDetail.vue

@@ -223,7 +223,7 @@
 			}else{
 				uni.showToast({
 					icon:'none',
-					title:'正在评审中'
+					title:'正在评级中'
 				})
 			}
 		}

packages/sonpingDetail/viewDetail.vue

@@ -38,6 +38,10 @@
 		  <text class="text_17">边子系列名称：</text>
 		  <text class="text_18">{{ item.sub_card_series }}</text>
 		</view>
+		<view class="flex-row group_12">
+		  <text class="text_17">卡片限编：</text>
+		  <text class="text_18">{{ item.limit_num }}</text>
+		</view>
 		<view class="flex-row group_13">
 		  <text class="text_19">卡片编码：</text>
 		  <text class="text_20">{{ item.card_code }}</text>

pages/order/order.vue

@@ -383,8 +383,8 @@
 						},
 						fail: err => {
 							uni.showModal({
-								title: '',
-								content: 'fail:' + JSON.stringify(err) + '支付失败',
+								title: '提示',
+								content: '已取消订单，请及时支付',
 								showCancel: false
 							})
 							this.clickButton = false;

pages/write/baseInfo.vue

@@ -180,18 +180,18 @@
 		let d = uni.getStorageSync('qxk_sysinfo')
 		if(d){
 			let options = d.fast_options
-			this.columnsData = options.filter((item)=>{
-				if(this.rateIndex == 3){
-					if(item.id == 0 || item.id == 4){
-						return item;
-					}
-				}else{
-					if(item.id <=3){
-						return item;
-					}
-				}
-			});
-			
+			// this.columnsData = options.filter((item)=>{
+			// 	if(this.rateIndex == 3){
+			// 		if(item.id == 0 || item.id == 4){
+			// 			return item;
+			// 		}
+			// 	}else{
+			// 		if(item.id <=3){
+			// 			return item;
+			// 		}
+			// 	}
+			// });
+			this.columnsData = options
 			let texts = this.columnsData.map((item)=>{
 				return item.title
 			})