shish 4 лет назад
Родитель
Сommit
9105283f27
2 измененных файлов с 5 добавлено и 16 удалено
  1. 3 15
      hdApp/src/admin/clear/info.vue
  2. 2 1
      hdApp/src/pagesPurchase/gatherPay.vue

+ 3 - 15
hdApp/src/admin/clear/info.vue

@@ -95,7 +95,7 @@
 		</view>
 		<view class="app-footer">
 			<button class="admin-button-com default" v-if="detailInfo.status == 1 && detailInfo.clearStyle==1" @click="cancelFn(detailInfo)">取消</button>
-			<button class="admin-button-com default" v-if="detailInfo.status == 1" @click="toClear(detailInfo)">付款结清</button>
+			<button class="admin-button-com big blue" v-if="detailInfo.status == 1" @click="toClear(detailInfo)">付款结清</button>
 		</view>
 	</view>
 </template>
@@ -127,6 +127,7 @@ export default {
 	},
 	methods: {
 		notLogin(){
+			return false
 			if(!this.$util.isEmpty(this.getLoginInfo.admin) && this.getLoginInfo.admin.currentShopId > 0){
 				return false
 			}
@@ -403,19 +404,6 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: flex-end;
-	& .admin-button-com {
-		padding: 0;
-		margin-right: 15upx;
-		width: 140upx;
-		height: 70upx;
-		line-height: 70upx;
-		text-align: center;
-		color: #3385ff;
-		border: 1px solid #3385ff;
-		&.active{
-			color: #666666;
-			border: 1px solid #ccc;
-		}
-	}
+	padding-right:40upx;
 }
 </style>

+ 2 - 1
hdApp/src/pagesPurchase/gatherPay.vue

@@ -66,7 +66,8 @@ export default {
 				},1000)
 			},
     _wxPay () {
-      purchaseClearWxPay({ orderSn: this.orderSn }).then(res => {
+      let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
+      purchaseClearWxPay({ orderSn: this.orderSn,currentMiniOpenId:currentMiniOpenId }).then(res => {
         wexinPay(res.data, this.getSuccess, this.getError)
       }).catch(err => { console.log(err) })
     },