Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/assets/iconfont/iconfont.css

@@ -37,7 +37,7 @@
   content: "\e60d";
 }
 
-.icon-fenxiang:before {
+.iconfont-fenxiang:before {
   content: "\e639";
 }
 

src/pages.json

@@ -92,6 +92,13 @@
 				"navigationBarTitleText": "申请退款"
 			}
 		}
+		,
+		{
+			"path": "pages/index/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券详情"
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationStyle": "custom"

src/pages/index/coupon.vue

+<template>
+  <view class="container">
+    <scroll-view class="tabs" scroll-x="true" @scroll="scroll">
+      <text class="tab" v-for="(item, index) in tabs" :key="index">{{ item }}</text>
+    </scroll-view>
+    <view class="itemBox">
+      <view class="item"></view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {} from 'vue';
+const tabs = ref(['推荐', '附近美食', '果蔬生鲜', '数码商城', '小吃快餐', '数码商城', '餐饮券']);
+</script>
+
+<style lang="scss" scoped>
+page {
+  background: #f3f3f3;
+}
+.container {
+  .tabs {
+    white-space: nowrap;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    height: 100rpx;
+    line-height: 100rpx;
+    font-size: 32rpx;
+    color: #333333;
+    font-weight: bold;
+    background: white;
+    .tab {
+      display: inline-block;
+      margin-right: 40rpx;
+    }
+  }
+  .itemBox {
+    padding: 0 23rpx;
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    margin-top: 20rpx;
+    .item {
+      width: 341rpx;
+      height: 674rpx;
+      background: #ffffff;
+    }
+  }
+}
+</style>

src/pages/index/index.vue

@@ -44,7 +44,12 @@
           <view v-else class="textF" @tap="toUse">去使用</view>
         </view>
       </scroll-view>
-      <image class="discount" src="../../static/index/discount.png" mode="widthFix" />
+      <image
+        @tap="toCoupon"
+        class="discount"
+        src="../../static/index/discount.png"
+        mode="widthFix"
+      />
     </view>
     <!-- 贵阳老味道 -->
     <!-- <view class="guiyang"></view> -->
@@ -223,6 +228,12 @@ const receive = (data) => {
     });
   }
 };
+// TO优惠券详情
+const toCoupon = () => {
+  xma.navigateTo({
+    url: '/pages/index/coupon',
+  });
+};
 // 获取分类
 const getClassification = () => {
   groupBuyList().then((res) => {

src/pages/packageDetails/packageDetails.vue

@@ -231,7 +231,7 @@
         <wd-icon v-else color="red" name="star-on" size="22px"></wd-icon>
         {{ shopInfo.privateIntFcount }}
       </view>
-      <view class="start">
+      <view class="start" @click="shareFn">
         <image src="@/static/shop/share.png"></image>
         分享
       </view>
@@ -275,6 +275,10 @@ function alert() {
     show.value = true;
   }
 }
+/**
+ * 分享
+ */
+function shareFn() {}
 function back() {
   xma.navigateBack({
     delta: 1,

src/pages/shop/confirmOrder.vue

@@ -129,14 +129,14 @@
             <image src="@/static/shop/wx-icon.png"></image>
             微信
           </view>
-          <radio class="radio" color="#F12A2A" value="0" :checked="0 == selectType" />
+          <radio class="radio" color="#F12A2A" value="TENPAY" :checked="'TENPAY' == selectType" />
         </view>
         <view class="pay-item">
           <view class="icon">
             <image src="@/static/shop/yzf-icon.png"></image>
             翼支付
           </view>
-          <radio class="radio" color="#F12A2A" value="2" :checked="2 == selectType" />
+          <radio class="radio" color="#F12A2A" value="BESTPAY" :checked="'BESTPAY' == selectType" />
         </view>
       </radio-group>
     </view>
@@ -163,7 +163,7 @@
 import Header from '@/pages/order/components/Header/index.vue';
 import { groupBuyConfirm, groupBuyUpdate, groupBuyCreate } from '@/api/confirmOrder';
 const imgUrl = import.meta.env.VITE_APP_IMG_URL;
-const selectType = ref(0);
+const selectType = ref('TENPAY');
 const prodId = ref(null);
 const skuId = ref(null);
 const showpopup = ref(false);
@@ -233,13 +233,16 @@ function submitOrder() {
   // remark String 否 备注
   const params = {
     id: orderInfo.value.key,
-    payWayCode: selectType.value,
     placeOrderWay: 'sgy',
+    payWayCode: 5,
+    tradeType: selectType.value,
   };
   groupBuyCreate(params).then((res) => {
     if (res.code === 0) {
       const { paymentUrl, merchantNo } = res.data.result;
-      plus.runtime.openURL(paymentUrl);
+      // window.location.href = paymentUrl;
+      window.open(paymentUrl);
+      // plus.runtime.openURL(paymentUrl);
       console.log('merchantNo', merchantNo);
     }
   });

src/pages/shop/shop.vue

@@ -198,8 +198,10 @@
               <text class="liulan"></text>
               <view class="pl-icon">
                 <view class="icon" @tap="giveTheThumbs(item, index)">
-                  <i v-if="item.give == 0" class="iconfont icon-aixin" />
-                  <i v-else style="color: red" class="iconfont icon-xiai" />
+                  <wd-icon v-if="item.give == 0" name="thumb-up" size="30rpx"></wd-icon>
+                  <wd-icon v-else name="thumb-up" color="red" size="30rpx"></wd-icon>
+                  <!-- <i v-if="item.give == 0" class="iconfont icon-aixin" /> -->
+                  <!-- <i v-else style="color: red" class="iconfont icon-xiai" /> -->
                   <text>{{ item.giveCount > 0 ? item.giveCount : '抢首赞' }}</text>
                 </view>
                 <!-- <view class="icon" @tap="collection(item)">