协销

api/other.js

@@ -66,18 +66,3 @@ export function querySaveInvoice(params) {
 		})
 	})
 }
-/**
- *@售后条款内容
- *@param
- */
-export function querySaveClause(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/clause',params, true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}

common/config/config.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
 	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

components/cm-module/creatOrder/sellerInvoice.vue

@@ -308,6 +308,7 @@
 			.text{
 				font-size: $font-size-28;
 				color: $text-color;
+				font-weight: bold;
 			}
 			.iconfont{
 				width: 50rpx;

components/cm-module/creatOrder/sellerRegulations.vue

@@ -17,12 +17,8 @@
 					<text class="iconfont icon-iconfontguanbi" @click="freightConfim"></text>
 					<view class="freight-radio">
 						<radio-group class="row-group" @change="radioChange">
-							<label class="row-input">
-								<view class="row-text noTk">无条款</view>
-								<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.stop="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>10?item.name.substr(0,10)+'...':item.name}}</view>
 								<radio class="row-radio" :value="item.name" :checked="index === current" color="#E15616"/>
 							</label>
 						</radio-group>
@@ -46,17 +42,9 @@
 		data(){
 			return{
 				regulaText:'无条款',
-				
 				freightMoney:0,
 				specClass: '',//规格弹窗css类，控制开关动画
-			}
-		},
-		watch: {
-			regulaDatas: {
-				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
-					this.regulaDatas = el
-				},
-				deep: true
+				clauseId:0
 			}
 		},
 		created() {
@@ -64,12 +52,14 @@
 		methods:{
 			gotoConten(id){
 				console.log(id)
-				this.$api.navigateTo(`/pages/service/sellconten?id=${id}`)
+				this.clauseId = id;
+				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			radioChange(e){
 				this.regulaText = e.target.value;
 			},
 			freightConfim(){//提交完成选择
+			this.$emit('showregulaAlert',this.clauseId)
 			this.hideSpec()
 			},
 			hideSpec() {//关闭弹窗
@@ -183,9 +173,6 @@
 			font-size: $font-size-28;
 			color: #1890f9;
 			float: left;
-			&.noTk{
-				color: #666666;
-			}
 		}
 	}
 	.freight-group{

components/cm-module/orderDetails/goodsList.vue

@@ -19,7 +19,7 @@
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{pros.name}}</view>
-							<view class="productspec" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
+							<view class="productspec product-view" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 							<view class="product-view">
 								<view class="view-num">单价：￥{{pros.price | NumFormat}}</view>
 							</view>
@@ -31,6 +31,8 @@
 							</view>
 							<view class="product-view">
 								<view class="view-num">税率：{{pros.taxRate}}%</view>
+							</view>
+							<view class="product-view">
 								<view class="view-num">折扣：{{pros.discount == null ? '0' : pros.discount}}%</view>
 							</view>
 							<view class="product-view">
@@ -58,7 +60,7 @@
 					</view>	
 				</view>
 				<view class="goods-pros-b">
-					<view class="count">共{{item.itemCount}}件商品</view>
+					<view class="count">共<label style="color: #e15616;">{{item.itemCount}}</label>件商品</view>
 					<view class="sum">
 						<view class="sum-none" v-if="item.promotionFullReduction>0">
 							<text class="money-sign">￥</text>
@@ -235,14 +237,15 @@
 				font-size: $font-size-26;	
 				position: relative;
 				.product-view{
-					width: 100%;
+					width: 50%;
 					height: auto;
-					display: flex;
+					// display: flex;
+					display: inline-block;
 					.view-num{
 						flex: 1;
 						text-align: left;
 						font-size: $font-size-26;
-						color: #666666;
+						color: #999999;
 						line-height: 44rpx;
 						.red{
 							color: #FF2000;
@@ -263,7 +266,7 @@
 				}
 				.productspec{
 					height: 44rpx;
-					color: #666666;
+					color: #999999;
 					line-height: 44rpx;
 				}
 				.productprice{
@@ -347,6 +350,8 @@
 				height: 80rpx;
 				margin-top: 12rpx;
 				float: left;
+				border-top: 2rpx solid #e1e1e1;
+
 				.count{
 					float: left;
 					font-size: $font-size-28;

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -4,7 +4,7 @@
 		<view class="button-content"> 
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('add',orderID)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
 			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>

pages.json

@@ -160,6 +160,11 @@
 			"style": {
 				"navigationBarTitleText": "隐私权政策"
 			}
+		},{
+			"path": "pages/service/sellconten",
+			"style": {
+				"navigationBarTitleText": "条款内容"
+			}
 		},{
             "path" : "pages/user/invoice/invoice",
             "style" : {

pages/service/sellConten.vue

@@ -1,4 +1,4 @@
-<template name="sellConten">
+<template>
 	<view class="container clearfix rich-text-temp">
 		<rich-text-template ref="childTemplate"></rich-text-template>
 	</view>
@@ -6,8 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { querySaveClause } from "@/api/other.js"
-	
 	export default{
 		components: {
 		   richTextTemplate
@@ -26,9 +24,9 @@
 		methods:{
 			initData(){
 				let self = this;
-				querySaveClause({clauseId:this.id}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
+				this.OtherService.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)
 				})
@@ -37,5 +35,16 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.container{
+		background: #fff;
+	}
+	.rich-text-temp rich-text.h4, .rich-text-temp rich-text.p {
+		color: #666666;
+	}
+	.rich-text-temp rich-text.h4, .rich-text-temp rich-text.p:nth-child(1) {
+		color: #333333;
+		text-align: center;
+		font-weight: bold;
+	}
 </style>

pages/user/order/order-payment.vue

@@ -152,7 +152,8 @@
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付，请使用线下转账方式付款',
-				payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
+				payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
+				pageType:''
 			}
 		},
 		onLoad(option) {

second/pages/form/form.vue

@@ -277,7 +277,7 @@
 				            secondProductType:null,//
 				            townId:'',//县区地址
 				            address:'',//详细地址
-				            image1:'',//图片
+				            image1:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg',//图片
 				            productDetails:'',//商品详细信息
 				            source:1,
 				         },
@@ -294,6 +294,7 @@
 				        vShow_secondBj:false,
 				        resultBj:false,
 				        vShow_detailTalkFlag:false,
+						playid:'',
 			}
 		},
 		methods:{
@@ -423,10 +424,10 @@
 				  this.$util.msg('请填写详细地址',2000);
 					return
 			 }
-				if(this.GoodsImagesList =='https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg'){
-					this.$util.msg('请上传图片',2000);
-					return;
-				}
+				// if(this.GoodsImagesList ==''){
+				// 	this.$util.msg('请上传图片',2000);
+				// 	return;
+				// }
 			 if(this.checkbox==false){
 				   this.$util.msg('请勾选已阅读',2000);
 					return
@@ -446,8 +447,11 @@
 			quxiao:function(){
 			 this.vShow_secondBj = false;
 			},
-			gopay:function(){
-				this.$api.navigateTo(`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`)
+			gopay(){
+				console.log(this.playid);
+				let url=`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`
+				console.log(url)
+				this.$api.navigateTo(`/pages/user/order/order-payment?pageType=1&type=confirm&productID=${this.playid}`)
 				this.vShow_secondBj = false;
 			},
 			changeBox:function () {

seller/pages/order/create-order.vue

@@ -49,6 +49,7 @@
 		<!-- 售后条例 -->
 		<seller-regulations ref="regulations"
 							:regulaDatas="regulationsData" 
+							:clauseId = "claData"
 							@showregulaAlert="handregulaAlertShow">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
@@ -128,6 +129,7 @@
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				isIphoneX:this.$store.state.isIphoneX,
 				regulationsData:[],
+				clauseId:''
 			}
 		},
 		onLoad(option){//商品数据
@@ -248,6 +250,9 @@
 					this.attributePallPrice()
 				}
 			},
+			handregulaAlertShow(id){
+				this.clauseId = id
+			},
 			checkedBalabce(){//勾选使用余额
 				if(this.userMoney > 0){
 					this.ischecked = !this.ischecked
@@ -332,8 +337,10 @@
 						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
 						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
-						freePostFlag:parseInt(this.freightData.freePostFlag)//运费形式
+						freePostFlag:parseInt(this.freightData.freePostFlag),//运费形式
+						clauseId:this.clauseId//售后条款
 					}
+					console.log(this.payInfo)
 				let params = {
 						orderSource:6,				  //提交来源
 						clubUserId:this.clubUserId,   //机构UserID

seller/pages/order/order-list.vue

@@ -111,6 +111,21 @@
 		</share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
+		<view class="aganBj" v-if="showAgan">
+			<view class="alertAgan">
+				<text class="title">以下商品已失效，不能进行购买。是否先将其他商品加入购物车？</text>
+				<view class="goods">
+					<view class="list">
+						<image class="image-left" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/15.jpg"></image>
+						<view class="name-right">韩国恩盛进口氢洁气小气泡清小气泡进口氢洁气小气泡清..</view>
+					</view>
+				</view>
+			</view>
+			<view class="btn">
+				<view class="">取消</view>
+				<view class="">确定</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -186,6 +201,8 @@
 				pullFlag: true,
 				navbarHeight:'',
 				nomoreText: '上拉显示更多',
+				showAgan:false,
+				
 			}
 		},
 		onLoad(option) {
@@ -355,8 +372,20 @@
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
 						break
+					case 'again':
+						this.handOrderAgain(data.orderId);
+						break	
 				}
 			},
+			handOrderAgain(id){
+				this.SellerService.SellerCreateOrderAgain({orderId:id,confirmFlag:0}).then(res =>{
+					if(res.code==0){
+						this.$api.navigateTo('/seller/pages/cart/cart')
+					}else{
+						
+					}
+				})
+			},
 			handOrderConfirm (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
 					affirmOrder({orderID:id}).then(response =>{

services/ajax.env.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

services/index.js

@@ -13,6 +13,7 @@ import ActivityService from './activity.service'
 import OrderService from './order.service'
 import SecondService from './second.service'
 import PublicService from './public.service.js'
+import OtherService from './other.service.js'
 
 let commonService = new CommonService(ajaxService)
 let locateService = new LocateService(ajaxService)
@@ -26,6 +27,7 @@ let activityService = new ActivityService(ajaxService)
 let orderService = new OrderService(ajaxService)
 let secondService = new SecondService(ajaxService)
 let publicService = new PublicService(ajaxService)
+let otherService = new OtherService(ajaxService)
 
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.CommonService = commonService
@@ -39,4 +41,5 @@ Vue.prototype.SellerService = sellerService
 Vue.prototype.ActivityService = activityService
 Vue.prototype.OrderService = orderService
 Vue.prototype.SecondService = secondService
-Vue.prototype.PublicService = publicService
+Vue.prototype.PublicService = publicService
+Vue.prototype.OtherService = otherService

services/sellse.service.js

@@ -122,5 +122,8 @@ export default class SellerService {
 	SellerCreateOrderSubmit (data = {}) {
 		return this.AjaxService.post({ url:'/seller/order/submit', data, isLoading: true })
 	}
-	
+	// 协销订单列表/再来一单
+	SellerCreateOrderAgain (data = {}) {
+		return this.AjaxService.post({ url:'/seller/again', data, isLoading: true })
+	}
 }