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

packages/ratingQueryDetail/ratingQueryDetail.vue

@@ -57,9 +57,9 @@
       <view class="flex-col section_6" v-if="$isRight(details.history)">
         <view class="flex-col group_16">
 			<lf-table :Header="header" :Content="details.history" height="auto" width="686" :showNumber="false"></lf-table>
-          <!-- <view class="flex-col items-center button" @click="setClipboardData">
+          <view class="flex-col items-center button" @click="setClipboardData" v-if="details.sub_order.pm_url">
             <text>复制拍卖链接</text>
-          </view> -->
+          </view>
         </view>
       </view>
     </view>
@@ -104,8 +104,9 @@
 	methods: {
 		// 复制拍卖链接 todo 暂时不用
 		setClipboardData(){
+			let that = this;
 			uni.setClipboardData({
-				data: '测试'
+				data: that.details.sub_order.pm_url
 			})
 		}
 	}

pages/index/index.vue

@@ -219,7 +219,9 @@
 			
 			async getSysInfo(){
 				let res = await sysInfo();
-				console.log("getSysInfo res",res)
+				//console.log("getSysInfo res",res)
+				let sysInfoDatas = res.data.datas;
+				uni.setStorageSync('qxk_sysinfo',sysInfoDatas);
 				let datas = res.data.datas.tips;
 				this.tipsDatas = datas;
 				this.tips = datas.map((item)=>{

pages/write/baseInfo.vue

@@ -83,13 +83,31 @@
           <!-- <text class="text_16">3</text> -->
 		  <u-input v-model="sonpingInfo.number" placeholder="请输入送评数量" type="number"></u-input>
         </view>
-        <view class="justify-between group_17">
+        <view class="justify-between group_17" @click="pickerShow(true)">
           <view class="flex-row group_18">
             <text class="text_17">是否快评：</text>
             <text class="text_18">(价格翻倍)</text>
           </view>
-		  <u-switch v-model="isQuickReview" activeColor="#e7a23f"></u-switch>
+		  
+		  <view class="pick-panel">
+			  <view>
+				  {{columnsData[columnsIndex].title}}
+			  </view>
+			  <image
+			    src="@/static/icon/rightArrow.png"
+			    class="image_10 image_11 rote90"
+			  />
+		  </view>
+		
+	
+		  <!-- <u-switch v-model="isQuickReview" activeColor="#e7a23f"></u-switch> -->
+		  
         </view>
+		<view class="flex-col group_19" v-if="columnsIndex!=0">
+			<view class="fast_desc">
+				{{columnsData[columnsIndex].desc}}
+			</view>
+		</view>
         <view class="flex-col group_19">
           <text>打包照片</text>
           <view class="flex-row equal-division_1">
@@ -120,6 +138,7 @@
         </view>
       </view>
     </view>
+		  <u-picker :show="show" :columns="columns" immediateChange="true" @cancel="pickerShow(false)" @confirm="confirmPicker"></u-picker>
   </view>
 </template>
 
@@ -130,7 +149,7 @@
     data() {
       return {
 		  address: {},
-		  isQuickReview: false,
+		  isQuickReview: 0,
 		  sonpingInfo: {
 			  name: '',
 			  phone: '',
@@ -139,11 +158,31 @@
 		  fileList: [],
 		  remarks: '',
 		  rateIndex: 0,
-		  coupon: ''
+		  coupon: '',
+		  show:false,
+		  columns:[],
+		  columnsData:null,
+		  columnsIndex:0,
 	  };
     },
+	// computed:{
+	// 	columns:()=>{
+	// 		return ['1','2'];
+	// 	},
+	// },
 	onLoad(options){
 		this.rateIndex = options.rate_index || 0;
+		let d = uni.getStorageSync('qxk_sysinfo')
+		if(d){
+			let options = d.fast_options
+			this.columnsData =[{id:0,title:'否'},...options] 
+			let texts = this.columnsData.map((item)=>{
+				return item.title
+			})
+			//t = [...t,...texts];
+			this.columns.push(texts)
+			
+		}
 	},
 	methods: {
 		async afterRead(event){
@@ -154,6 +193,16 @@
 		deletePic(event){
 			this.fileList.splice(event.index, 1);
 		},
+		pickerShow(v){
+			this.show = v
+		},
+		confirmPicker(e){
+			console.log("confirmPicker",e)
+			this.columnsIndex = e.indexs[0]
+			this.isQuickReview = e.indexs[0]
+			//e.
+			this.pickerShow(false)
+		},
 		next(){
 			let sonpingInfo = this.sonpingInfo;
 			if(!this.$isRight(this.address)) return this.$msg('请选择收货地址');
@@ -167,6 +216,21 @@
 </script>
 
 <style scoped lang="css">
+	.pick-panel{
+		display: flex;
+	}
+	.rote90{
+		transform: rotate(90deg);
+	}
+	.fast_desc{
+		display:inline-block;
+		width: 100%;
+		height: auto;
+		word-wrap: break-word;
+		word-break: break-all;
+		white-space: pre-wrap;
+		font-size: 28rpx;
+	}
   .equal-division-item {
     flex: 1 1 240rpx;
     padding: 10rpx 0;