8-22

components/payment/index.vue

@@ -12,7 +12,8 @@
 					<view class="text">
 						<view class="name">{{item.name}}</view>
 						<view class="info" v-if="item.value == 'yue'">
-							{{item.title}} <span class="money">￥{{ item.number }}</span>
+							{{item.title}} 
+							<!-- <span class="money">￥{{ item.number }}</span> -->
 						</view>
 						<view class="info" v-else>{{item.title}}</view>
 					</view>
@@ -35,6 +36,10 @@
 	import colors from '@/mixins/color.js';
 	export default {
 		props: {
+			payTypes: {
+				type: String,
+				default: 'weixin',
+			},
 			payTT: {
 				type: Boolean,
 				default: false,
@@ -74,6 +79,7 @@
 		watch: {
 			payMode: {
 				handler(newV, oldValue) {
+					let that = this
 					let newPayList = [];
 					newV.forEach((item, index) => {
 						if (item.payStatus) {
@@ -81,9 +87,21 @@
 							newPayList.push(item)
 						}
 					});
-					this.active = newPayList[0].index;
-					this.paytype = newPayList[0].value;
-					this.number = newPayList[0].number || 0;
+					let finded = false
+					newPayList.forEach((item, index) => {
+						if(item.value == that.payTypes) {
+							that.active = item.index;
+							that.paytype = item.value;
+							that.number = item.number || 0;
+							finded = true
+						}
+					})
+					if(!finded){
+						this.active = newPayList[0].index;
+						this.paytype = newPayList[0].value;
+						this.number = newPayList[0].number || 0;
+					}
+					
 				},
 				immediate: true,
 				deep: true
@@ -92,9 +110,11 @@
 		methods: {
 			payType(number, paytype, index) {
 				this.active = index;
+				uni.setStorageSync('action',index)
 				console.log(this.active,'this.active');
 				this.paytype = paytype;
 				this.number = number;
+				console.log(this.paytype,this.number,'this.number')
 				this.$emit('changePayType', paytype)
 			},
 			close: function() {

manifest.json

@@ -5,6 +5,7 @@
     "versionName" : "2.6.0",
     "versionCode" : 267,
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

pages/goods/order_confirm/yuyue.vue

@@ -143,7 +143,7 @@
 		<invoice-picker :inv-show="invShow" :inv-list="invList" :inv-checked="invChecked" :is-special="special_invoice"
 			:url-query="urlQuery" @inv-close="invClose" @inv-change="invChange" @inv-cancel="invCancel">
 		</invoice-picker>
-		<payment v-if="totalPrice" :payMode="cartArr" :pay_close="pay_close" :isCall="true" :totalPrice="totalPrice"
+		<payment v-if="totalPrice" :payMode="cartArr" :pay_close="pay_close" :isCall="true" :totalPrice="totalPrice" :payTypes="payType"
 			@changePayType="changePayType" @onChangeFun="onChangeFun"></payment>
 		<deliveryMethod ref="deliveryMethod" :isDisplay="isDisplay" :storeList="storeList" :ptype="ptype"
 			:storeSelfMention="store_self_mention" @deliveryFun="deliveryFun" @storeFun="storeFun"></deliveryMethod>
@@ -449,7 +449,8 @@
 			computedServe() {
 				computedServe({
 					products: this.product_id,
-					coupon_id:this.couponId
+					coupon_id:this.couponId,
+					payType: this.payType
 				}).then(ress => {
 					console.log(ress)
 					this.payInfo = ress.data
@@ -1151,11 +1152,13 @@
 			},
 			changePayType(type) {
 				this.payType = type
-				this.computedPrice()
+				// this.computedPrice()
+				this.computedServe()
 			},
 			computedPrice: function() {
 				let shippingType = this.shippingType;
 				console.log(this.priceGroup.couponPrice == 0 ? 0 : this.couponId,'this.priceGroup.couponPrice == 0 ? 0 : this.couponId');
+				console.log(this.orderKey,'this.orderKey')
 				postOrderComputed(this.orderKey, {
 					addressId: this.addressId,
 					useIntegral: this.useIntegral ? 1 : 0,
@@ -1174,7 +1177,7 @@
 						this.$set(this.priceGroup, 'storePostageDiscount', result.storePostageDiscount);
 					}
 				}).catch(err => {
-					return that.$util.Tips({
+					return this.$util.Tips({
 						title: err
 					});
 				})

pages/goods/order_list/serve.vue

@@ -112,8 +112,8 @@
 						<view class="bnt cancelBnt" v-if="item.status == -1 && item.refund_status == -1 ">退款已拒绝</view>
 					</view>
 					<view class="bottom acea-row row-right row-middle" v-if="item.status == 2">
-						<view class="bnt cancelBnt" v-if="item.reward && item.reward.id">已表扬</view>
-						<view class="bnt cancelBnt showbtn" v-else @click="das(item)">表扬</view>
+						<view class="bnt cancelBnt" v-if="item.reward && item.reward.id">已打赏</view>
+						<view class="bnt cancelBnt showbtn" v-else @click="das(item)">打赏</view>
 						<view class="bnt cancelBnt " v-if="item.complaint && item.complaint.id" >已投诉</view>
 						<view class="bnt cancelBnt " v-else @click="ts(item)">投诉</view>
 					</view>
@@ -138,8 +138,8 @@
 				<view class="tit">
 					多少都是您的心意
 				</view>
-				<input type="number" v-model="dsPrice" placeholder="请输入任意表扬金额(1~5)"/>
-				<input type="text" v-model="dsMark" placeholder="请输入表扬内容"/>
+				<input type="number" v-model="dsPrice" placeholder="请输入任意打赏金额(1~5)"/>
+				<input type="text" v-model="dsMark" placeholder="请输入打赏原因"/>
 				<view class="btn-wrap">
 					<view class="btn" @click="closeDs">
 						取消
@@ -375,7 +375,7 @@
 				let that = this;
 				if(!that.dsPrice) {
 					return that.$util.Tips({
-						title: '请输入表扬金额'
+						title: '请输入打赏金额'
 					});
 				}
 				if(that.dsPrice > 5) {

pages/index/index.vue

@@ -414,7 +414,7 @@
 					}
 				});
 			});
-			this.getSeverCardList()
+			// this.getSeverCardList()
 		},
 		onUnload(){
 			// 清除监听

pages/user/index.vue

@@ -411,7 +411,7 @@
 					</view>
 				</view>
 				<view class="user-menus" style="margin-top: 25rpx;" v-if="service_status == 1 && storeMenu.length">
-					<view class="menu-title">商家管理</view>
+					<view class="menu-title">创业型联营店股东</view>
 					<view class="list-box">
 						<block v-for="(item,index) in storeMenu" :key="index">
 							<view class="item" :url="item.url" v-if="item.url!='#' && item.url!='/pages/service/index'"
@@ -420,10 +420,15 @@
 								<text>{{item.name}}</text>
 							</view>
 						</block>
+						<view class="item" :url="'/pages/goods/goods_list/index?cid=143'" 
+							@click="goMenuPage('/pages/goods/goods_list/index?cid=143', '供应链下单')">
+							<image src="/static/images/jh.png"></image>
+							<text>供应链下单</text>
+						</view>
 					</view>
 				</view>
 				<view class="menus-list" v-if="service_status == 2 && storeMenu.length">
-					<view class="title">商家管理</view>
+					<view class="title">创业型联营店股东</view>
 					<block v-for="(item,index) in storeMenu" :key="index">
 						<view class="item acea-row row-between-wrapper" :url="item.url" hover-class="none"
 							v-if="item.url!='#' && item.url!='/pages/service/index'"
@@ -435,11 +440,19 @@
 							</view>
 						</view>
 					</block>
+					<view class="item acea-row row-between-wrapper" :url="'/pages/goods/goods_list/index?cid=143'" hover-class="none"
+						@click="goMenuPage('/pages/goods/goods_list/index?cid=143', '供应链下单')">
+						<image src="/static/images/jh.png"></image>
+						<view class="text acea-row row-between-wrapper">
+							<view>供应链下单</view>
+							<view class="iconfont icon-xiangyou"></view>
+						</view>
+					</view>
 				</view>
 				<view class="user-menus" style="margin-top: 25rpx;"
 					v-if="userInfo.adminid ||( service_status == 1 && storeMenu.length)">
 					<!-- <view class="menus-list"> -->
-					<view class="menu-title">员工功能</view>
+					<view class="menu-title">创业型联营店天使</view>
 					<view class="list-box">
 						<view class="item" @click="goMenuPage('/pages/goods/order_list/ygOrder', '我的订单')">
 							<image src="/static/images/staffSq.png"></image>
@@ -449,6 +462,11 @@
 							<image src="/static/images/staffOrder.png"></image>
 							<view>我的佣金</view>
 						</view>
+						<!-- /pages/goods/goods_list/index?cid=143 -->
+						<view class="item" @click="goMenuPage('/pages/goods/goods_list/index?cid=143', '项目下单')">
+							<image src="/static/images/jh.png"></image>
+							<view>项目下单</view>
+						</view>
 						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=5', '年终分红')">
 							<image src="/static/images/guquan.png"></image>
 							<view>年终分红</view>
@@ -477,7 +495,7 @@
 				</view>
 				<view class="user-menus" style="margin-top: 25rpx;" v-if="userInfo.is_shareholder==1">
 					<!-- <view class="menus-list"> -->
-					<view class="menu-title">股东功能</view>
+					<view class="menu-title">投资型创业股东</view>
 					<view class="list-box">
 						<view class="item" @click="goMenuPage('/pages/shareholder/certificate/red', '股权记录')">
 							<image src="/static/images/user-1.png"></image>

utils/request.js

@@ -41,6 +41,7 @@ function baseRequest(url, method, data, {
 		//登录过期自动登录
 		if (!store.state.app.token && !checkLogin()) {
 			toLogin();
+			console.log(url,'url')
 			return Promise.reject({
 				msg: '未登录'
 			});