zhanghui пре 1 година
родитељ
комит
0ab05cb9ba
2 измењених фајлова са 23 додато и 19 уклоњено
  1. 2 2
      pages/groupbuying_details/order_details_confirm/index.vue
  2. 21 17
      pages/order/index.vue

+ 2 - 2
pages/groupbuying_details/order_details_confirm/index.vue

@@ -70,7 +70,7 @@
 							</view>
 							<view class="a-b2">
 								<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" @click="openPopup"></image>
-								<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" @click="callPhone(selfTake.phone)"></image>
+								<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" @click="callPhone(grouponOrderData.phone)"></image>
 							</view>
 						</view>
 					</block>
@@ -165,7 +165,7 @@
 				<image
 						class="image_3"
 						referrerpolicy="no-referrer"
-						:src="selfTake.qrCode"
+						:src="grouponOrderData.qrCode"
 				/>
 				<text class="text_23">长按图片识别&nbsp;“加团长微信”</text>
 			</view>

+ 21 - 17
pages/order/index.vue

@@ -89,7 +89,7 @@
 								</text>
 							</view>
 							<view class="a-b2">
-								<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" @click="openPopup"></image>
+								<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" @click="openPopup(item.qrCode)"></image>
 								<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" @click="callPhone(item.phone)"></image>
 							</view>
 						</view>
@@ -103,21 +103,7 @@
 					</view>
 				</view>
 
-				<uni-popup ref="popup" type="center">
-					<view class="block_3">
-						<image  @click="closePopup"
-								class="icon_1"
-								referrerpolicy="no-referrer"
-								src="/static/images/X.png"
-						/>
-						<image
-								class="image_3"
-								referrerpolicy="no-referrer"
-								:src="item.qrCode"
-						/>
-						<text class="text_23">长按图片识别&nbsp;“加团长微信”</text>
-					</view>
-				</uni-popup>
+
 
 			</view>
 			<view class="loadingicon acea-row row-center-wrapper" v-if="orderList.length > 0">
@@ -136,6 +122,22 @@
 		<!-- #endif -->
 		<payment :payMode="payMode" :pay_close="pay_close" @onChangeFun="onChangeFun" :order_id="pay_order_id"
 			:totalPrice="totalPrice"></payment>
+
+		<uni-popup ref="popup" type="center">
+			<view class="block_3">
+				<image  @click="closePopup"
+						class="icon_1"
+						referrerpolicy="no-referrer"
+						src="/static/images/X.png"
+				/>
+				<image
+						class="image_3"
+						referrerpolicy="no-referrer"
+						:src="qrCode"
+				/>
+				<text class="text_23">长按图片识别&nbsp;“加团长微信”</text>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -185,6 +187,7 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
+			qrCode:'',
 			navigationList: [{
 				title: '全部',
 				id: 0,
@@ -294,7 +297,8 @@ export default {
 			this.$refs.popup.close()
 		},
 
-		openPopup(){
+		openPopup(qrCode){
+			this.qrCode = qrCode;
 			this.$refs.popup.open()
 		},