搜索

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/sellerRegulations.vue

@@ -19,7 +19,7 @@
 						<radio-group class="row-group" @change="radioChange">
 							<label class="row-input" v-for="(item, index) in regulaDatas" :key="index">
 								<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"/>
+								<radio class="row-radio" :value="item.id" :checked="index === current" color="#E15616"/>
 							</label>
 						</radio-group>
 					</view>
@@ -51,15 +51,18 @@
 		},
 		methods:{
 			gotoConten(id){
-				console.log(id)
-				this.clauseId = id;
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			radioChange(e){
-				this.regulaText = e.target.value;
+				this.clauseId = e.target.value;
+				this.regulaDatas.forEach((item,index)=>{
+					if(item.id==this.clauseId){
+						this.regulaText = item.name;
+					}
+				})
 			},
 			freightConfim(){//提交完成选择
-			this.$emit('showregulaAlert',this.clauseId)
+			this.$emit('handleData',this.clauseId)
 			this.hideSpec()
 			},
 			hideSpec() {//关闭弹窗
@@ -162,7 +165,10 @@
 			line-height: 66rpx;
 			width: 100%;
 			display: block;
-
+			&:nth-of-type(1){
+				color: #666666;
+				pointer-events: none;
+			}
 		}
 		.row-radio{
 			float: right;

components/cm-module/orderDetails/goodsList.vue

@@ -47,8 +47,8 @@
 								</view>
 								<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
 							</view>
-							<view class="product-view">
-								<view class="view-num">合计：￥{{pros.totalFee | NumFormat}}</view>
+							<view class="product-view allPrice">
+								<view class="view-num">合计：<label style="color:#f94b4b ;">￥{{pros.totalFee | NumFormat}}</label></view>
 							</view>
 						</view>	
 					</view>
@@ -241,6 +241,9 @@
 					height: auto;
 					// display: flex;
 					display: inline-block;
+					&.allPrice{
+						width: 100%;
+					}
 					.view-num{
 						flex: 1;
 						text-align: left;
@@ -361,7 +364,7 @@
 					justify-content: flex-end;
 				}
 				.sum{
-					width: 530rpx;
+					width: 520rpx;
 					float: right;
 					.sum-none{
 						width: 100%;

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-cancel">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('agan',order)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-cancel" @click.stop="onShareCode">

pages/login/bindOperator.vue

@@ -1,5 +1,11 @@
 <template>
-	<view class="container login" v-if="isUserInfo">
+	<view class="container login" >
+		<!-- v-if="isUserInfo" -->
+		<view class="login-form title">
+			<view class="text">
+				<label class="iconfont icon-tishi"></label>请填写如下信息成为机构运营人员后才能操作订单
+			</view>
+		</view>
 		<view class="login-form clearfix">
 			<view class="login-input">
 				<input type="text" 
@@ -7,6 +13,7 @@
 					   maxlength="30" 
 					   class="input" 
 					   placeholder="请输入姓名"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 		</view>
@@ -17,6 +24,7 @@
 					   maxlength="11" 
 					   class="input" 
 					   placeholder="请输入手机号"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 		</view>
@@ -27,6 +35,7 @@
 					   maxlength="4" 
 					   class="input" 
 					   placeholder="请输入右侧图形验证码"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 			<view class="login-input img-btn">
@@ -46,6 +55,7 @@
 					   maxlength="6" 
 					   class="input" 
 					   placeholder="请输入短信验证码"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 			<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
@@ -58,7 +68,7 @@
 			</view>
 		</view>
 		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">绑定并登录</view>
+			<view class="login-btn"  @click="bindWechatInfo">绑定</view>
 		</view>
 		<view class="login-foot">
 			<text class="foot-text">本操作会绑定您的微信，绑定后您可使用微信直接登录【采美采购商城】小程序。</text>
@@ -119,9 +129,9 @@
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							this.$store.commit('updateStatus',response.data)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/seller/pages/index/index')
+								// this.$api.navigateTo('/seller/pages/index/index')
 							}else{
-								this.$api.switchTabTo('/pages/tabBar/home/index')
+								// this.$api.switchTabTo('/pages/tabBar/home/index')
 							}
 						}).catch(error =>{
 							this.logout()
@@ -247,75 +257,91 @@
 		width: 100%;
 		height: auto;
 		border-top: 1px solid #F7F7F7;
-		padding-top: 100rpx;
+		padding-top: 30rpx;
 		.login-foot{
-			width: 702rpx;
+			width: 528rpx;
 			height: 88rpx;
 			padding: 0 24rpx;
-			margin-top: 30rpx;
+			margin: 30rpx auto;
+			text-align: center;
 			.foot-text{
 				font-size: 24rpx;
 				line-height: 44rpx;
-				color:$text-color;
+				color:#999999;
 			}
 		}
 		.login-form{
 			width: 702rpx;
 			height: auto;
 			padding: 0 24rpx;
+			&.title{
+				color: #e15616;
+				font-size: 24rpx;
+				text-align: center;
+				margin-bottom: 20rpx;
+				.text{
+					padding: 20rpx 24rpx;
+					background: #fff0e9;
+					border-radius: 16rpx;
+					.iconfont{
+						margin-right: 20rpx;
+						position: relative;
+						top: 5rpx;
+					}
+				}
+			}
 			.login-input{
 				width: 654rpx;
 				height: 40rpx;
 				padding: 24rpx;
 				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
+				border-bottom: 1rpx solid #e1e1e1;
 				&.code{
 					width: 370rpx;
 					float: left;
-					margin-right: 20rpx;
+					margin-right: 10rpx;
 				}
 				&.btn{
 					width: 258rpx;
 					height: 88rpx;
 					padding: 0;
 					float: left;
-					background: $btn-confirm;
+					border: 0;
 					.input{
-						width: 258rpx;
+						width: 280rpx;
 						height: 88rpx;
 						line-height: 88rpx;
 						padding: 0;
-						border-radius: 14rpx;
+						border-radius: 45rpx;
 						color: #FFFFFF;
 						background: $btn-confirm;
 					}
 					&.disabled{
 						background: #F7F7F7;
 						.input{
-							background: #F7F7F7;
 							color: #999999;
 						}
 					}
 				}
 				&.img-btn{
-					width: 250rpx;
+					width: 270rpx;
 					height: 88rpx;
 					padding: 0;
 					float: left;
 					background: #FFFFFF;
 					display: block;
+					border: 0;
 					.vscodeimg{
-						width: 180rpx;
-						height: 88rpx;
+						width: 160rpx;
+						height: 64rpx;
 						float: left;
 						display: flex;
 						flex-direction: column;
 						align-items: center;
-						border-radius: 14rpx;
+						border-radius: 6rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
@@ -323,25 +349,29 @@
 						}
 					}
 					.vscod-refresh{
-						width: 70rpx;
+						width: 95rpx;
 						float: right;
-						display: flex;
+						// display: flex;
 						flex-direction: column;
 						align-items: center;
+						margin-top: 10rpx;
 						.icon-shuaxin{
-							font-size: 48rpx;
-							color: #333333;
+							font-size: 36rpx;
+							color: #999999;
+							display: inline-block;
 						}
 						.ref-text{
 							font-size: 24rpx;
-							color: #333333;
+							color: #999999;
+							display: inline-block;
+							margin-left: 10rpx;
 						}
 					}
 				}
 				.input{
 					width: 100%;
 					height: 100%;
-					background: #F7F7F7;
+					// background: #F7F7F7;
 					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
@@ -396,4 +426,7 @@
 			}
 		}
 	}
+	.placeholder{
+		color:#b2b2b2 ;
+	}
 </style>

second/pages/form/form.vue

@@ -224,6 +224,7 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'
 	import { uploadFileImage } from "@/api/utils.js"
+	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'secondHandrelease',
@@ -445,12 +446,42 @@
 			 this.vShow_secondBj = false;
 			},
 			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.MiniWxPayFor()
 				this.vShow_secondBj = false;
 			},
+			MiniWxPayFor(){
+				authorize.getCode('weixin').then(wechatcode =>{
+					let params ={
+							code:wechatcode,
+							productId:this.playid
+						}
+					this.PayService.SecondHandPay(params).then(response =>{
+						let PayInfo = JSON.parse(response.data.data.payInfo);
+						this.WxRequestPayment(PayInfo)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			WxRequestPayment(data){
+				let self = this
+				wx.requestPayment({
+					'timeStamp': data.timeStamp,
+					'nonceStr': data.nonceStr,
+					'package': data.package,
+					'signType': data.signType,
+					'paySign': data.paySign,
+					'success':function(res){
+						wx.reLaunch({url: 'second/pages/product/product-list'});
+					},
+					'fail':function(res){
+						self.$util.msg('用户取消支付~')
+					},
+					'complete':function(res){
+			
+					}
+				})
+			},
 			changeBox:function () {
 				this.checkbox = !this.checkbox;
 			},
@@ -481,7 +512,7 @@
 		.secondradio{display: inline-block;margin-left: 40rpx;}	
 		.Secondary{margin-left: 161rpx;}
 		.secondradio view.active {color: #e15616;}
-		.placeholder{color: #9aa5b5;}
+		.placeholder{color: #b2b2b2;}
 		.linqi_text { width: 100%; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -30%;
@@ -491,14 +522,14 @@
 		.row .spacing.second{width: 70%;}
 		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
 		.row.fenlei{height: auto;margin: 10rpx 0;border: 0}
-		.select {position: relative;color: #9aa5b5;text-align: left;user-select: none;}
+		.select {position: relative;color: #b2b2b2;text-align: left;user-select: none;}
 		.row .spacing{display: inline-block;margin-left: 50rpx;width: 75%;vertical-align:middle;position: relative}
 		.select .placeholder {position: relative;cursor: pointer;width: 100%;display: inline-block;}
-		.icon-xiayibu{right: 0rpx;;color: #9aa5b5;position: absolute}
-		.xiangliao{font-size: 26rpx;margin-right: 10rpx;color: #9aa5b5}
+		.icon-xiayibu{right: 0rpx;;color: #b2b2b2;position: absolute}
+		.xiangliao{font-size: 26rpx;margin-right: 10rpx;color: #b2b2b2}
 		.icon-jiagexiangliao{color: #e15616 !important;}
 		.pricecolor{margin-left: 10rpx;}
-		.showflag{color: #9aa5b5;}
+		.showflag{color: #b2b2b2;}
 		.border-grey{width: 100%;resize: none;padding: 20rpx 0;height: 160rpx;border-bottom: 2rpx solid #e1e1e1;}
 		.release-main-container {overflow: hidden;margin: 20rpx 0}
 		.uploadGoodsImages{display: flex;overflow-x: auto;overflow-y: hidden;}

seller/pages/cart/cart.vue

@@ -13,7 +13,7 @@
 							<view class="shoptitle">
 								<!--选择商店的全部商品 :disabled="isNnder"-->
 								<view class="checkbox-box" @click.stop="checkShop(item)">
-									<view class="checkbox iconfont" :class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']"></view>
+									<view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
 								</view>
 								<view v-if="item.promotions" class="floor-item-act">
 									<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>	
@@ -25,7 +25,7 @@
 									<view class="goods-pros-t">
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)">
-											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']"></view>
+											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)">
 											<image :src="pros.mainImage ? pros.mainImage :''" alt="" />
@@ -88,7 +88,7 @@
 				<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 					<view class="footer-le">
 						<view class="foot-check checkbox-box" @tap.stop="checkAll()">
-							<button class="checkbox iconfont" :class="[isCheckAll?'icon-gouxuan':'icon-weigouxuan']"></button> 
+							<button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button> 
 							<view class="text">全选</view>
 						</view>
 						<view class="sum">
@@ -780,11 +780,11 @@
 			font-size: $font-size-26;
 			height: 50rpx;
 			line-height: 50rpx;
-			color: $text-color;
+			color: #666666;
 			float: left;
 			padding-left: 10rpx;
 			text{
-				color: $color-system;
+				// color: $color-system;
 				margin: 0 6rpx;
 			}
 		}
@@ -797,8 +797,8 @@
 			line-height: 50rpx;
 			border-radius: 30rpx;
 			background:#FFFFFF;
-			border: 1px solid #C9C9C9;
-			color: #E15616;
+			border: 1px solid #E15616;
+			color: $color-system;
 			float: right;
 			text-align: center;
 			&.none{
@@ -825,6 +825,9 @@
 			background-color:#FFFFFF;
 			font-size: 36rpx;
 			color:$color-system;
+			&.icon-yixuanze{
+				color: #b2b2b2;
+			}
 		}
 		&.disabled{
 			.checkbox{

seller/pages/order/create-order.vue

@@ -47,10 +47,10 @@
 			</view>
 		</view>
 		<!-- 售后条例 -->
-		<seller-regulations ref="regulations"
+		<seller-regulations  ref="regulations"
+							 v-if="isRequest && isDepositFlg&&seconDepositFlg" 
 							:regulaDatas="regulationsData" 
-							:clauseId = "claData"
-							@showregulaAlert="handregulaAlertShow">
+							@handleData="claData">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 底部 -->
@@ -129,7 +129,8 @@
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				isIphoneX:this.$store.state.isIphoneX,
 				regulationsData:[],
-				clauseId:''
+				clauseId:0,
+				seconDepositFlg:true,
 			}
 		},
 		onLoad(option){//商品数据
@@ -158,6 +159,7 @@
 		methods: {
 			getInitProdcutCrearOrder(option){//二手下单初始化查询
 				this.$api.getStorage().then((resolve) =>{
+					this.seconDepositFlg = false;
 					this.serviceProviderId = resolve.serviceProviderID
 					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,productCount:this.productCount,productId:this.productIds}
 					this.SellerService.GetSettlementBySencondProduct(params).then(response =>{
@@ -250,8 +252,8 @@
 					this.attributePallPrice()
 				}
 			},
-			handregulaAlertShow(id){
-				this.clauseId = id
+			claData(id){
+				this.clauseId = id;
 			},
 			checkedBalabce(){//勾选使用余额
 				if(this.userMoney > 0){
@@ -333,7 +335,6 @@
 				})
 				//订单信息
 				this.payInfo = {
-						clauseId:0,//条款（暂时保留）
 						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
 						freight:parseInt(this.freightData.freight).toFixed(2),//邮费

seller/pages/order/order-details.vue

@@ -17,6 +17,9 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
+			<view class="clause" @tap.stop="openclauseConten(clauseData.id)">
+				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+			</view>
 			<!-- 底部button -->
 			<order-button ref="orderButton" 
 						  v-if= "isRequest" 
@@ -110,7 +113,8 @@
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
-				}
+				},
+				clauseData:{},
 			}
 		},
 		onLoad(option){
@@ -129,6 +133,9 @@
 			this.initOrderDetaileData()
 		},
 		methods: {
+			openclauseConten(id){
+				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
 				queryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
@@ -147,6 +154,7 @@
 					this.receiptAmount = resData.order.receiptAmount
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 					this.ableUserMoney = resData.ableUserMoney
+					this.clauseData = resData.clause
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
 						this.$api.switchTabTo('/seller/pages/index/index')
@@ -367,5 +375,18 @@
 			}	
 		}
 	}
-	
+	.clause{
+		float: right;
+		font-size: 24rpx;
+		color: #999999;
+		margin-top: 60rpx;
+		margin-right: 24rpx;
+		.text{
+			color: #1890f9;
+			&.color-bg{
+				color: #333333;
+				pointer-events: none;
+			}
+		}
+	}
 </style>

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/pay.service.js

@@ -33,4 +33,11 @@ export default class PayService {
 	PayOrderPayLink (data = {}) {
 		return this.AjaxService.post({ url:'/PayOrder/payLink', data, isLoading: true })
 	}
+	/**
+	 *@param 二手发布支付
+	 *@param  orderId  主订单ID
+	 */
+	SecondHandPay (data = {}) {
+		return this.AjaxService.post({ url:'/PayOrder/appletsSecondHandPay', data, isLoading: true })
+	} 
 }