Administrator 4 years ago
parent
commit
9ebd938474

+ 0 - 41
components/cm-module/creatOrder/sellConten.vue

@@ -1,41 +0,0 @@
-<template name="sellConten">
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { querySaveClause } from "@/api/other.js"
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: '',
-				id:''
-			}
-		},
-		onLoad(option){
-			this.type = 'afterSale';
-			this.id= option.clauseId
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				querySaveClause({clauseId:this.id}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

+ 3 - 2
components/cm-module/creatOrder/sellerRegulations.vue

@@ -22,7 +22,7 @@
 								<radio class="row-radio" value="无条款" color="#E15616"/>
 							</label>
 							<label class="row-input" v-for="(item, index) in regulaDatas" :key="index">
-								<view class="row-text" @click="gotoConten(item.id)">{{item.name.length>15?item.name.substr(0,15)+'...':item.name}}</view>
+								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>15?item.name.substr(0,15)+'...':item.name}}</view>
 								<radio class="row-radio" :value="item.name" :checked="index === current" color="#E15616"/>
 							</label>
 						</radio-group>
@@ -63,7 +63,8 @@
 		},
 		methods:{
 			gotoConten(id){
-				this.$api.navigateTo('/components/cm-module/creatOrder/sellConten?clauseId='+id)
+				console.log(id)
+				this.$api.navigateTo(`/pages/service/sellconten?id=${id}`)
 			},
 			radioChange(e){
 				this.regulaText = e.target.value;

+ 2 - 1
seller/pages/order/create-order.vue

@@ -127,7 +127,7 @@
 				isDepositFlg:true,
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				isIphoneX:this.$store.state.isIphoneX,
-				regulationsData:{},
+				regulationsData:[],
 			}
 		},
 		onLoad(option){//商品数据
@@ -182,6 +182,7 @@
 						this.totalOriginalPrice = data.reducedPrice + data.totalAmount
 						this.rechargeGoods = data.rechargeGoods
 						this.allPrice = this.payAllPrice = data.totalAmount
+						this.regulationsData = data.clauseList
 						this.goodsData.forEach(item =>{
 							item.productsList.forEach(pros =>{
 								if(this.depositIds.indexOf(pros.productID)>=0){