Merge branch 'main' of https://gitlab.com/tea28/client

# Conflicts:
#	src/pages/product/p_details.vue

src/pages.json

@@ -228,6 +228,18 @@
 			"style": {
 				"navigationBarTitleText": "积分专区"
 			}
+		},
+		{
+			"path": "pages/pay-agreement/index",
+			"style": {
+				"navigationBarTitleText": "购买协议"
+			}
+		},
+		{
+			"path": "pages/notice/detail",
+			"style": {
+				"navigationBarTitleText": "公告详情"
+			}
 		}
 	],
 	"tabBar": {

src/pages/index/index.vue

@@ -1,316 +1,392 @@
 <template>
-    <div class="Appindex">
-        <!-- 顶部 -->
-        <view class="head">
-            <!-- 搜索框 -->
-            <!-- <view class="head_search">
+  <div class="Appindex">
+    <!-- 顶部 -->
+    <view class="head">
+      <!-- 搜索框 -->
+      <!-- <view class="head_search">
                 <text class="iconfont">&#xe661;</text>
                 <text class="search_text">请输入搜索关键字</text>
             </view> -->
-            <!-- 搜索框-end -->
-
-            <!-- 轮播图 -->
-            <swiper-banner :radius="1" imgScale="5:2" :imgArr="BannerImg" :duration="1000" :interval="5000" :circular="true" :autoplay="true" @goList="goList" :indicator-dots="true" indicator-active-color="#12B280" indicator-color="rgba(255, 255, 255, .82)"></swiper-banner>
-            <!-- 轮播图-end -->
-
-            <!-- 公告 -->
-            <view class="head_notice clearfix">
-                <view class="notice_title">
-                    <image class="gg_img" src="@/static/img/gg.png"></image>
-                </view>
-                <swiper class="notice_swiper" vertical autoplay circular :interval="5000" :duration="1000">
-                    <swiper-item v-for="(item, index) in not_list" :key="index">
-                        <text class="not_list ellipsis1">{{ item.title }}</text>
-                        <text class="not_ico iconfont">&#xe62e;</text>
-                    </swiper-item>
-                </swiper>
-            </view>
-            <!-- 公告-end -->
-
-            <!-- 金刚区 -->
-            <view class="head_area">
-                <view class="area_list" v-for="(item, index) in area_list" :key="index" @click="setPageUrl(item)">
-                    <image class="area_img" :src="item.url"></image>
-                    <view class="area_name">{{ item.name }}</view>
-                </view>
-            </view>
-            <!-- 金刚区-end -->
-
-            <!-- 活动 -->
-            <view class="activity" v-if="spc_list.length > 0">
-                <image class="act_one_img" :src="spc_list[0].url" @click="setPageUrl({type:4})"  mode=""></image>
-                <view class="act_other">
-                    <image class="act_two_img" :src="spc_list[1].url" mode=""></image>
-                    <image class="act_two_img" :src="spc_list[2].url" mode=""></image>
-                </view>
-            </view>
-            <!-- 活动-end -->
+      <!-- 搜索框-end -->
+
+      <!-- 轮播图 -->
+      <swiper-banner
+        :radius="1"
+        imgScale="5:2"
+        :imgArr="BannerImg"
+        :duration="1000"
+        :interval="5000"
+        :circular="true"
+        :autoplay="true"
+        @goList="goList"
+        :indicator-dots="true"
+        indicator-active-color="#12B280"
+        indicator-color="rgba(255, 255, 255, .82)"
+      ></swiper-banner>
+      <!-- 轮播图-end -->
+
+      <!-- 公告 -->
+      <view class="head_notice clearfix">
+        <view class="notice_title">
+          <image class="gg_img" src="@/static/img/gg.png"></image>
         </view>
-        <view class="list_bar">
-            <div class="tit">猜你喜欢</div>
-            <view class="product-list">
-                <view class="product" v-for="(i, s) in productList" :key="s" @click="NavToGoodsDetail(i.id,i.type)">
-                    <view class="image-view">
-                        <image class="product-image" :src="i.original_img"></image>
-                    </view>
-                    <view :class="['product-title', 'ellipsis1']">{{ i.goods_name }}</view>
-                    <view class="product-price">
-                        <text class="product-price-original"><text class="product-unit">￥</text>{{ i.price }}</text>
-                        <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
-                        <!-- <text class="product-tip">{{i.tip}}</text> -->
-                    </view>
-                    <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + '批发积分' : i.give_cha_bao + '茶宝'}}</view>
-                </view>
-                <view class='fz_w_text mar_t20 mar_b20'>让数字经济赋能美好生活！</view>
-            </view>
+        <swiper
+          class="notice_swiper"
+          vertical
+          autoplay
+          circular
+          :interval="5000"
+          :duration="1000"
+        >
+          <swiper-item
+            v-for="(item, index) in not_list"
+            :key="index"
+            @click="toDetail(item)"
+          >
+            <text class="not_list ellipsis1">{{ item.title }}</text>
+            <text class="not_ico iconfont">&#xe62e;</text>
+          </swiper-item>
+        </swiper>
+      </view>
+      <!-- 公告-end -->
+
+      <!-- 金刚区 -->
+      <view class="head_area">
+        <view
+          class="area_list"
+          v-for="(item, index) in area_list"
+          :key="index"
+          @click="setPageUrl(item)"
+        >
+          <image class="area_img" :src="item.url"></image>
+          <view class="area_name">{{ item.name }}</view>
         </view>
-    </div>
+      </view>
+      <!-- 金刚区-end -->
+
+      <!-- 活动 -->
+      <view class="activity" v-if="spc_list.length > 0">
+        <image
+          class="act_one_img"
+          :src="spc_list[0].url"
+          @click="setPageUrl({ type: 4 })"
+          mode=""
+        ></image>
+        <view class="act_other">
+          <image class="act_two_img" :src="spc_list[1].url" mode=""></image>
+          <image class="act_two_img" :src="spc_list[2].url" mode=""></image>
+        </view>
+      </view>
+      <!-- 活动-end -->
+    </view>
+    <view class="list_bar">
+      <div class="tit">猜你喜欢</div>
+      <view class="product-list">
+        <view
+          class="product"
+          v-for="(i, s) in productList"
+          :key="s"
+          @click="NavToGoodsDetail(i.id, i.type)"
+        >
+          <view class="image-view">
+            <image class="product-image" :src="i.original_img"></image>
+          </view>
+          <view :class="['product-title', 'ellipsis1']">{{
+            i.goods_name
+          }}</view>
+          <view class="product-price">
+            <text class="product-price-original"
+              ><text class="product-unit">￥</text>{{ i.price }}</text
+            >
+            <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
+            <!-- <text class="product-tip">{{i.tip}}</text> -->
+          </view>
+          <view class="product-txt"
+            >赠送{{
+              i.give_integral
+                ? i.give_integral + "批发积分"
+                : i.give_cha_bao + "茶宝"
+            }}</view
+          >
+        </view>
+        <view class="fz_w_text mar_t20 mar_b20">让数字经济赋能美好生活！</view>
+      </view>
+    </view>
+  </div>
 </template>
 <script>
-let app=getApp();
+let app = getApp();
 var appEv = app.$vm.$options;
 // import goodslist from "@/components/goodsList"; //商品列表
 import swiperBanner from "@/components/swiperBanner"; //轮播
 import { get, post } from "@/request/api.js";
 export default {
-    name: "Appindex",
-    components: {
-        // goodslist, //商品列表
-        swiperBanner, //轮播
-    },
-    data() {
-        return {
-            BannerImg: [], // 轮播图列表
-            not_list: [], // 公告列表
-             // 金刚区
-            area_list: [
-                 {name: "零售区", url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/cart.png", type:1},
-                 {name: "批发区", url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/wholesale.png", type:2},
-                 {name: "精品优选", url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/preferred.png", type:3},
-                 {name: "茶宝兑换", url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/integral.png", type:5}
-            ],
-            spc_list: [
-                {url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/f70cd8e0-e468-45eb-a9f7-2c42713cd607.jpg"},
-                {url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/b13c0186-fdfc-4b87-b466-5c9fc336cc54.jpg"},
-                {url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/49886d9c-ce5a-49ca-a281-12910541344f.jpg"}
-            ], //活动列表
-            productList: [], //商品数据
-        };
-    },
-    onLoad(option) {},
-    onLaunch() {},
-    onShow() {
-        this.loadData()
-        this.getBanner(); //获取轮播图
-        this.getAnnounce(); //获取公告列表
-        // this.getImageTwo(); //金刚区
-        // this.getImage(); //获取活动列表
-    },
-    onHide() {},
-    methods: {
-        loadData() {
-            post("goods/indexGoods").then((res) => {
-                if (res.code === 0) {
-                    this.productList = res.data.data;
-                }
-            });
+  name: "Appindex",
+  components: {
+    // goodslist, //商品列表
+    swiperBanner, //轮播
+  },
+  data() {
+    return {
+      BannerImg: [], // 轮播图列表
+      not_list: [], // 公告列表
+      // 金刚区
+      area_list: [
+        {
+          name: "零售区",
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/cart.png",
+          type: 1,
         },
-        // 跳转到商品详情页
-        NavToGoodsDetail(id, type) {
-            this.goto("/pages/product/p_details", { id, type });
+        {
+          name: "批发区",
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/wholesale.png",
+          type: 2,
         },
-        // 获取轮播图
-        getBanner() {
-            post("banner").then((res) => {
-                if (res.code === 0) {
-                    this.BannerImg = []
-                    res.data.data.forEach(e => {
-                        if(e.image) this.BannerImg.push(e.image)
-                    });
-                }
-            });
+        {
+          name: "精品优选",
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/preferred.png",
+          type: 3,
         },
-        // 获取公告列表
-        getAnnounce() {
-            post("notice").then((res) => {
-                if (res.code === 0) {
-                    this.not_list = [res.data.data];
-                }
-            });
+        {
+          name: "茶宝兑换",
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/menu/integral.png",
+          type: 5,
         },
-        
-        // 获取金刚区列表
-        getImageTwo() {
-            post("ShuZiTeaSpecial/special/imageTwo").then((res) => {
-                if (res.status == 200) {
-                    this.area_list = res.data;
-                }
-            });
+      ],
+      spc_list: [
+        {
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/f70cd8e0-e468-45eb-a9f7-2c42713cd607.jpg",
         },
-        // 获取活动区列表
-        getImage() {
-            post("ShuZiTeaSpecial/special/image").then((res) => {
-                if (res.status == 200) {
-                    this.spc_list = res.data;
-                }
-            });
+        {
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/b13c0186-fdfc-4b87-b466-5c9fc336cc54.jpg",
         },
-        // 轮播图跳转
-        goList(e) {},
-        // 金刚区跳转
-        setPageUrl(item){
-            if([1,3,4].includes(item.type)){
-                this.goto('/pages/product/productRetail',{type:item.type})
-            }
-            else if(item.type == 2){
-                this.goto('/pages/product/productWholesale',{type:2})
-            }
-            else if(item.type == 5){
-                this.goto('/pages/product/productTeaBaby',{type:item.type})
-            }
-            else{
-                appEv.errTips('此功能暂未开放！')
-                return false
-            }
+        {
+          url: "https://teaclub.oss-cn-chengdu.aliyuncs.com/ShuZiTea/ShuZiTeaHT/202210/49886d9c-ce5a-49ca-a281-12910541344f.jpg",
         },
+      ], //活动列表
+      productList: [], //商品数据
+    };
+  },
+  onLoad(option) {},
+  onLaunch() {},
+  onShow() {
+    this.loadData();
+    this.getBanner(); //获取轮播图
+    this.getAnnounce(); //获取公告列表
+    // this.getImageTwo(); //金刚区
+    // this.getImage(); //获取活动列表
+  },
+  onHide() {},
+  methods: {
+    loadData() {
+      post("goods/indexGoods").then((res) => {
+        if (res.code === 0) {
+          this.productList = res.data.data;
+        }
+      });
+    },
+    // 跳转到商品详情页
+    NavToGoodsDetail(id, type) {
+      this.goto("/pages/product/p_details", { id, type });
     },
-    computed: {},
-    watch: {},
-    onShareAppMessage: function () {
-        let userinfo = uni.getStorageSync('userinfo');
-        var path = '/pages/index/index?agentId=1';
-        if (userinfo.user_id) {
-            path = '/pages/index/index?agentId=' + userinfo.user_id;
+    // 获取轮播图
+    getBanner() {
+      post("banner").then((res) => {
+        if (res.code === 0) {
+          this.BannerImg = [];
+          res.data.data.forEach((e) => {
+            if (e.image) this.BannerImg.push(e.image);
+          });
         }
-        var title = `让数字经济赋能美好生活！`;
-        return {
-            title: title,
-            path: path
+      });
+    },
+    // 获取公告列表
+    getAnnounce() {
+      post("notice").then((res) => {
+        if (res.code === 0) {
+          this.not_list = [res.data.data];
+        }
+      });
+    },
+    //跳转公告详情
+    toDetail(item) {
+      uni.redirectTo({
+        url:
+          "/pages/notice/detail?detail=" +
+          encodeURIComponent(JSON.stringify(item)),
+      });
+      // this.goto("/pages/notice/detail", { ...item });
+    },
+
+    // 获取金刚区列表
+    getImageTwo() {
+      post("ShuZiTeaSpecial/special/imageTwo").then((res) => {
+        if (res.status == 200) {
+          this.area_list = res.data;
         }
+      });
     },
+    // 获取活动区列表
+    getImage() {
+      post("ShuZiTeaSpecial/special/image").then((res) => {
+        if (res.status == 200) {
+          this.spc_list = res.data;
+        }
+      });
+    },
+    // 轮播图跳转
+    goList(e) {},
+    // 金刚区跳转
+    setPageUrl(item) {
+      if ([1, 3, 4].includes(item.type)) {
+        this.goto("/pages/product/productRetail", { type: item.type });
+      } else if (item.type == 2) {
+        this.goto("/pages/product/productWholesale", { type: 2 });
+      } else if (item.type == 5) {
+        this.goto("/pages/product/productTeaBaby", { type: item.type });
+      } else {
+        appEv.errTips("此功能暂未开放！");
+        return false;
+      }
+    },
+  },
+  computed: {},
+  watch: {},
+  onShareAppMessage: function () {
+    let userinfo = uni.getStorageSync("userinfo");
+    var path = "/pages/index/index?agentId=1";
+    if (userinfo.user_id) {
+      path = "/pages/index/index?agentId=" + userinfo.user_id;
+    }
+    var title = `让数字经济赋能美好生活！`;
+    return {
+      title: title,
+      path: path,
+    };
+  },
 };
 </script>
 <style scoped lang='scss'>
 .head {
-    padding: 12rpx 28rpx;
+  padding: 12rpx 28rpx;
 }
 
 .head_search {
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: #f3f5f7;
-    border-radius: 32rpx;
-    text-align: center;
-    font-size: 28rpx;
-    color: #bbbbbb;
-    margin-bottom: 26rpx;
-
-    .search_text {
-        margin-left: 14rpx;
-    }
+  width: 100%;
+  height: 64rpx;
+  line-height: 64rpx;
+  background: #f3f5f7;
+  border-radius: 32rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #bbbbbb;
+  margin-bottom: 26rpx;
+
+  .search_text {
+    margin-left: 14rpx;
+  }
 }
 
 .head_notice {
-    margin: 30rpx 0;
+  margin: 30rpx 0;
 
-    .notice_title {
-        width: 130rpx;
-        height: 40rpx;
-        float: left;
+  .notice_title {
+    width: 130rpx;
+    height: 40rpx;
+    float: left;
 
-        .gg_img {
-            width: 100%;
-            height: 40rpx;
-        }
+    .gg_img {
+      width: 100%;
+      height: 40rpx;
     }
+  }
 
-    .notice_swiper {
-        height: 40rpx;
-        padding-left: 20rpx;
-        font-size: 28rpx;
-        float: left;
-        box-sizing: border-box;
-        width: calc(100% - 130rpx);
+  .notice_swiper {
+    height: 40rpx;
+    padding-left: 20rpx;
+    font-size: 28rpx;
+    float: left;
+    box-sizing: border-box;
+    width: calc(100% - 130rpx);
 
-        .not_list {
-            width: calc(100% - 50rpx);
-        }
+    .not_list {
+      width: calc(100% - 50rpx);
+    }
 
-        .not_ico {
-            width: 30rpx;
-            font-size: 28rpx;
-            color: #999;
-        }
+    .not_ico {
+      width: 30rpx;
+      font-size: 28rpx;
+      color: #999;
+    }
 
-        .not_list,
-        .not_ico {
-            display: inline-block;
-            vertical-align: middle;
-            height: 40rpx;
-            line-height: 40rpx;
-        }
+    .not_list,
+    .not_ico {
+      display: inline-block;
+      vertical-align: middle;
+      height: 40rpx;
+      line-height: 40rpx;
     }
+  }
 }
 
 // 金刚区
 .head_area {
-    margin: 20rpx 0 20rpx;
-    padding: 20rpx 0;
-    border-radius: 18rpx;
-    box-shadow: 4rpx 4rpx 26rpx 2rpx rgba(17, 18, 29, 0.08);
-
-    .area_list {
-        display: inline-block;
-        width: 25%;
-        text-align: center;
+  margin: 20rpx 0 20rpx;
+  padding: 20rpx 0;
+  border-radius: 18rpx;
+  box-shadow: 4rpx 4rpx 26rpx 2rpx rgba(17, 18, 29, 0.08);
+
+  .area_list {
+    display: inline-block;
+    width: 25%;
+    text-align: center;
 
-        .area_img {
-            width: 46rpx;
-            height: 46rpx;
-            margin-bottom: 12rpx;
-        }
+    .area_img {
+      width: 46rpx;
+      height: 46rpx;
+      margin-bottom: 12rpx;
+    }
 
-        .area_name {
-            font-size: 24rpx;
-            color: #474747;
-        }
+    .area_name {
+      font-size: 24rpx;
+      color: #474747;
     }
+  }
 }
 
 // 金刚区-end
 
 // 活动
 .activity {
-    .act_one_img {
-        display: inline-block;
-        width: 300rpx;
-        height: 378rpx;
-        margin-right: 10rpx;
-    }
+  .act_one_img {
+    display: inline-block;
+    width: 300rpx;
+    height: 378rpx;
+    margin-right: 10rpx;
+  }
 
-    .act_other {
-        display: inline-block;
-        width: calc(100% - 300rpx - 10rpx);
-    }
+  .act_other {
+    display: inline-block;
+    width: calc(100% - 300rpx - 10rpx);
+  }
 
-    .act_two_img {
-        width: 100%;
-        height: 185rpx;
-    }
+  .act_two_img {
+    width: 100%;
+    height: 185rpx;
+  }
 }
 
 // 活动-end
 
 // 商品列表
-.list_bar{
-    .tit{
-        text-align: center;
-        font-size: 36rpx;
-        color: #121212;
-        padding: 40rpx 0 20rpx;
-        font-weight: bold;
-    }
+.list_bar {
+  .tit {
+    text-align: center;
+    font-size: 36rpx;
+    color: #121212;
+    padding: 40rpx 0 20rpx;
+    font-weight: bold;
+  }
 }
 .product-list {
   padding: 0 20rpx;
@@ -330,8 +406,8 @@ export default {
     // border: 1px solid #eee;
     border-radius: 5px;
     box-shadow: 4rpx 4rpx 26rpx 2rpx rgba(17, 18, 29, 0.08);
-    &:nth-child(2n){
-        margin-left: 3%;
+    &:nth-child(2n) {
+      margin-left: 3%;
     }
   }
 

src/pages/notice/detail.vue

@@ -0,0 +1,69 @@
+<template>
+  <view class="container">
+    <!-- 公告详情 -->
+    <view class="title">{{noticeDetail.title}}</view>
+    <view class="time" v-if="noticeDetail">{{ $day(noticeDetail.add_time * 1000).format('YYYY-MM-DD HH:mm:ss') }}</view>
+    <jyf-parser :html="noticeDetail.content" class="mar_t50"></jyf-parser>
+    <!-- 公告详情-end -->
+  </view>
+</template>
+
+<script>
+let app = getApp();
+// let reqApi = new ReqApi();
+var appEv = app.$vm.$options;
+import { post } from "@/request/api.js";
+import jyfParser from "@/components/jyf-parser/jyf-parser.vue";
+// import { ReqApi } from "@/utils/reqTools.js";
+export default {
+  data() {
+    return {
+      content: "",
+      noticeDetail: undefined,
+    };
+  },
+  onLoad(option) {
+    this.noticeDetail = JSON.parse(decodeURIComponent(option.detail));
+    console.log(this.noticeDetail, "qqqq");
+    // this.loadData()
+  },
+  methods: {
+    loadData() {
+      let data = {
+        type: 2,
+      };
+      post("/my/article", data).then((res) => {
+        if (res.code == 0) {
+          this.content = res.data.data.content;
+          console.log(this.content);
+          // this.BannerImg = res.list;
+        }
+      });
+    },
+  },
+  components: {
+    jyfParser,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 用户须知
+.container {
+  border-top: 20rpx solid #f5f5f5;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  .title{
+    margin-top: 20rpx;
+    font-size: 48rpx;
+    font-weight: bold;
+  }
+  
+  .time{
+    margin-top: 10rpx;
+    font-size: 30rpx;
+    color: #666363;
+  }
+}
+// 用户须知-end
+</style>

src/pages/pay-agreement/index.vue

@@ -0,0 +1,49 @@
+<template>
+	<view class="container">
+		<!-- 用户须知 -->
+		<jyf-parser :html="content" class="mar_t50"></jyf-parser>
+		<!-- 用户须知-end -->
+	</view>
+</template>
+
+<script>
+let app=getApp();
+// let reqApi = new ReqApi();
+var appEv = app.$vm.$options;
+import { post } from "@/request/api.js";
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+// import { ReqApi } from "@/utils/reqTools.js";
+	export default {
+		data() {
+			return {
+				content:''
+			};
+		},
+		onLoad(){
+			this.loadData()
+		},
+		methods:{
+			loadData(){
+				let data = {
+					type:5
+				}
+				post("/my/article",data).then(res => {
+				  if (res.code == 0) {
+				    this.content = res.data.data.content
+					console.log(this.content)
+				    // this.BannerImg = res.list;
+				  }
+				}); 
+			}
+		},
+		components:{
+					jyfParser
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+// 用户须知
+.container{border-top: 20rpx solid #f5f5f5;padding: 0 20rpx;box-sizing: border-box;}
+// 用户须知-end
+</style>

src/pages/product/p_details.vue

@@ -1,95 +1,144 @@
 <template>
-    <view class="container">
-        <!-- 轮播图 -->
-        <swiper-banner imgScale="25:17" :imgArr="detail.goods_img" :duration="1000" :interval="5000" :circular="true" :autoplay="true" :indicator-dots="true" indicator-active-color="#12B280" indicator-color="rgba(255, 255, 255, .82)"></swiper-banner>
-        <!-- 轮播图-end -->
-        <!-- 价格信息栏 -->
-        <view class="price_info flex_r flex_ac flex_jb">
-            <view v-if="type == 5" class="price">
-                <span v-if="Number(detail.cost_price) != 0">{{ detail.cost_price }}元</span>
-                <span v-if="Number(detail.cha_bao) != 0 && Number(detail.cost_price) != 0">+</span>
-                <span v-if="Number(detail.cha_bao) != 0">{{ detail.cha_bao }}茶宝</span>
-            </view>
-            <view v-else class="price" :class="type == 2 ? 'samll' : ''">￥{{ type == 2 ? detail.trade_price : detail.cost_price }}</view>
-            <view class="price_span flex_r flex_ac flex_je">
-                <view class="triangle"></view>
-                <view class="span_conten flex_r flex_ac flex_jc">{{
-                    goodsDa.type == 1
-                    ? "零售专区"
-                    : goodsDa.type == 2
-                    ? "批发专区"
-                    : goodsDa.type == 3
-                    ? "精品专区"
-                    : goodsDa.type == 4
-                    ? "今日值得买"
-                    : goodsDa.type == 5
-                    ? "茶宝兑换"
-                    : ""
-                    }}</view>
-            </view>
-        </view>
-        <!-- 价格信息栏-end -->
-        <!-- 标题信息栏 -->
-        <view class="title_info">
-            <view class="goods_name">{{ detail.goods_name }}</view>
-            <view class="goods_subName">{{ detail.goodsMsg }}</view>
+  <view class="container">
+    <!-- 轮播图 -->
+    <swiper-banner
+      imgScale="25:17"
+      :imgArr="detail.goods_img"
+      :duration="1000"
+      :interval="5000"
+      :circular="true"
+      :autoplay="true"
+      :indicator-dots="true"
+      indicator-active-color="#12B280"
+      indicator-color="rgba(255, 255, 255, .82)"
+    ></swiper-banner>
+    <!-- 轮播图-end -->
+
+    <!-- 价格信息栏 -->
+    <view class="price_info flex_r flex_ac flex_jb">
+      <view v-if="type == 5" class="price">
+        <span v-if="Number(detail.cost_price) != 0"
+          >{{ detail.cost_price }}元</span
+        >
+        <span
+          v-if="Number(detail.cha_bao) != 0 && Number(detail.cost_price) != 0"
+          >+</span
+        >
+        <span v-if="Number(detail.cha_bao) != 0">{{ detail.cha_bao }}茶宝</span>
+      </view>
+      <view v-else class="price" :class="type == 2 ? 'samll' : ''"
+        >￥{{ type == 2 ? detail.trade_price : detail.cost_price }}</view
+      >
+      <view class="price_span flex_r flex_ac flex_je">
+        <view class="triangle"></view>
+        <view class="span_conten flex_r flex_ac flex_jc">{{
+          goodsDa.type == 1
+            ? "零售专区"
+            : goodsDa.type == 2
+            ? "批发专区"
+            : goodsDa.type == 3
+            ? "精品专区"
+            : goodsDa.type == 4
+            ? "今日值得买"
+            : goodsDa.type == 5
+            ? "茶宝兑换"
+            : ""
+        }}</view>
+      </view>
+    </view>
+    <!-- 价格信息栏-end -->
+
+    <!-- 标题信息栏 -->
+    <view class="title_info">
+      <view class="goods_name">{{ detail.goods_name }}</view>
+      <view class="goods_subName">{{ detail.goodsMsg }}</view>
+    </view>
+    <!-- 标题信息栏-end -->
+
+    <!-- 产品简介 -->
+    <view class="brief mar_t20">
+      <view class="brief_title flex_r flex_ac">产品简介</view>
+      <view class="brief_con">
+        <jyfParser :html="detail.goods_content" ref="jyf"></jyfParser>
+        <!-- <image :lazy-load="true" style="width: 100%;display: block;" v-for="(item,index) in detail.goodsDetailesImage" :key="index" :src="item" mode="widthFix"></image> -->
+      </view>
+    </view>
+    <!-- 产品简介-end -->
+
+    <!-- 底部导航组件 -->
+    <view class="option">
+      <uni-goods-nav
+        :fill="true"
+        :options="options"
+        :buttonGroup="buttonGroup"
+        @click="onClick"
+        @buttonClick="buttonClick"
+      />
+    </view>
+    <!-- 底部导航组件-end -->
+    <!-- 授权 -->
+    <!-- <authorize-module v-if="showAuth" :shopInfo="shopInfo" @authSuccess="onAuthSuccess" @onGotUserInfo="onGotUserInfo" ></authorize-module> -->
+    <!-- 授权-end -->
+
+    <!-- 购买或加入购物车弹窗 -->
+    <uni-popup ref="shopping" type="bottom">
+      <view class="shopping">
+        <view class="close_con flex_r flex_je">
+          <image
+            class="close_img"
+            src="/static/close.png"
+            @tap="closeBtn"
+            mode=""
+          ></image>
         </view>
-        <!-- 标题信息栏-end -->
-        <!-- 产品简介 -->
-        <view class="brief mar_t20">
-            <view class="brief_title flex_r flex_ac">产品简介</view>
-            <view class="brief_con">
-                <jyfParser :html="detail.goods_content" ref="jyf"></jyfParser>
-                <!-- <image :lazy-load="true" style="width: 100%;display: block;" v-for="(item,index) in detail.goodsDetailesImage" :key="index" :src="item" mode="widthFix"></image> -->
+        <view class="goods_info flex_r">
+          <image class="goods_img" :src="detail.original_img" mode=""></image>
+          <view class="goods_con flex_c flex_jb">
+            <view class="shop_names">{{ detail.goods_name }}</view>
+            <!-- <view class="goods_msg">{{type == 2 ? detail.pfCombination : '￥' + detail.price}}</view> -->
+            <view class="num_con flex_r flex_je">
+              <uni-number-box
+                :min="1"
+                @change="bindChange"
+                :value="buyNum"
+              ></uni-number-box>
             </view>
+          </view>
         </view>
-        <!-- 产品简介-end -->
-        <!-- 底部导航组件 -->
-        <view class="option">
-            <uni-goods-nav :fill="true" :options="options" :buttonGroup="buttonGroup" @click="onClick" @buttonClick="buttonClick" />
+        <view class="goods_option flex_r flex_ac flex_jc" v-if="type == 2">
+          <view class="goods_raido flex_r flex_ac" @tap="setWay('1')">
+            <view
+              class="raido_img"
+              :class="pfway == '1' ? 'raido_box' : ''"
+            ></view>
+            <view class="raido_text">申请寄售</view>
+          </view>
+          <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
+            <view
+              class="raido_img"
+              :class="pfway == '0' ? 'raido_box' : ''"
+            ></view>
+            <view class="raido_text">发货邮寄</view>
+          </view>
         </view>
-        <!-- 底部导航组件-end -->
-        <!-- 授权 -->
-        <!-- <authorize-module v-if="showAuth" :shopInfo="shopInfo" @authSuccess="onAuthSuccess" @onGotUserInfo="onGotUserInfo" ></authorize-module> -->
-        <!-- 授权-end -->
-        <!-- 购买或加入购物车弹窗 -->
-        <uni-popup ref="shopping" type="bottom">
-            <view class="shopping">
-                <view class="close_con flex_r flex_je">
-                    <image class="close_img" src="/static/close.png" @tap="closeBtn" mode=""></image>
-                </view>
-                <view class="goods_info flex_r">
-                    <image class="goods_img" :src="detail.original_img" mode=""></image>
-                    <view class="goods_con flex_c flex_jb">
-                        <view class="shop_names">{{ detail.goods_name }}</view>
-                        <!-- <view class="goods_msg">{{type == 2 ? detail.pfCombination : '￥' + detail.price}}</view> -->
-                        <view class="num_con flex_r flex_je">
-                            <uni-number-box :min="1" @change="bindChange" :value="buyNum"></uni-number-box>
-                        </view>
-                    </view>
-                </view>
-                <view class="goods_option flex_r flex_ac flex_jc" v-if="type == 2">
-                    <view class="goods_raido flex_r flex_ac" @tap="setWay('1')">
-                        <view class="raido_img" :class="pfway == '1' ? 'raido_box' : ''"></view>
-                        <view class="raido_text">申请寄售</view>
-                    </view>
-                    <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
-                        <view class="raido_img" :class="pfway == '0' ? 'raido_box' : ''"></view>
-                        <view class="raido_text">发货邮寄</view>
-                    </view>
-                </view>
-                <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
-                    <label class="option_box">
-                        <checkbox value="1" :checked="checked" color="#2DB389" style="transform: scale(0.7)" />
-                        我已阅读同意<text @tap.stop="getProPage">《购买协议》</text>
-                    </label>
-                </checkbox-group>
-                <view class="confim flex_r flex_ac flex_jc" @tap="ToPayPage">确定</view>
-            </view>
-        </uni-popup>
-        <!-- 购买或加入购物车弹窗-end -->
-    </view>
+        <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
+          <label class="option_box">
+            <checkbox
+              value="1"
+              :checked="checked"
+              color="#2DB389"
+              style="transform: scale(0.7)"
+            />
+            我已阅读同意<text @tap.stop="getProPage">《购买协议》</text>
+          </label>
+        </checkbox-group>
+        <view class="confim flex_r flex_ac flex_jc" @tap="ToPayPage">确定</view>
+      </view>
+    </uni-popup>
+    <!-- 购买或加入购物车弹窗-end -->
+  </view>
 </template>
+
 <script>
 let page = 1;
 let app = getApp();
@@ -104,464 +153,436 @@ import uniGoodsNav from "@/components/uni-goods-nav/uni-goods-nav.vue";
 import uniNumberBox from "@/components/uni-number-box/uni-number-box.vue";
 import authorizeModule from "@/components/authorize-module/index";
 export default {
-    components: {
-        uniPopup,
-        jyfParser,
-        uniGoodsNav,
-        swiperBanner,
-        uniNumberBox,
-        authorizeModule,
+  components: {
+    uniPopup,
+    jyfParser,
+    uniGoodsNav,
+    swiperBanner,
+    uniNumberBox,
+    authorizeModule,
+  },
+  data() {
+    return {
+      imgArr: ["/static/goods5.jpg"],
+      content: "",
+      options: [
+        // 底部导航跳转
+        {
+          icon: "home",
+          text: "主页",
+        },
+        // {
+        // 	icon: 'cart',
+        // 	text: '购物车',
+        // 	info: 0
+        // }
+      ],
+      buttonGroup: [
+        // 底部操作按钮
+        // {
+        // 	text: '加入购物车',
+        // 	backgroundColor: '#ff0000',
+        // 	color: '#fff'
+        // },
+        {
+          text: "立即购买",
+          backgroundColor: "#ffa200",
+          color: "#fff",
+        },
+      ],
+      btnIndex: 0, // 用户点击按钮事件判断 0：加入购物车；1：立即购买
+      type: null, // 商品类型，1零售 2批发 3精品 4今日值买
+      goodsId: "", // 商品ID
+      id: "", //合伙人套餐ID
+      detail: {
+        goods: {},
+      }, // 商品详情
+      checked: false, //是否选中协议
+      buyNum: 1, //购买数量
+      pfway: "0", // 批发
+      showAuth: false,
+
+      userinfo: {},
+      goodsDa: {},
+    };
+  },
+  onLoad: function (e) {
+    this.type = e.type;
+    this.goodsDa = e;
+    this.userinfo = uni.getStorageSync("userinfo");
+    this.loadData(e);
+  },
+  onShow: function () {},
+  methods: {
+    // 商品详情信息
+    loadData(da) {
+      post("goods/goodsDetail", da).then((res) => {
+        if (res.code === 0) {
+          this.detail = res.data.data;
+          let imgs = [];
+          imgs.push(this.detail.original_img);
+          imgs.push(...this.detail.goods_img);
+          this.detail.goods_img = imgs;
+        } else {
+          uni.showModal({
+            title: "提示",
+            content: res.msg,
+            showCancel: false,
+            success: function (res) {
+              if (res) {
+                uni.navigateBack({
+                  delta: 1,
+                });
+              }
+            },
+          });
+        }
+      });
     },
-    data() {
-        return {
-            imgArr: ["/static/goods5.jpg"],
-            content: "",
-            options: [
-                // 底部导航跳转
-                {
-                    icon: "home",
-                    text: "主页",
-                },
-                // {
-                //  icon: 'cart',
-                //  text: '购物车',
-                //  info: 0
-                // }
-            ],
-            buttonGroup: [
-                // 底部操作按钮
-                // {
-                //  text: '加入购物车',
-                //  backgroundColor: '#ff0000',
-                //  color: '#fff'
-                // },
-                {
-                    text: "立即购买",
-                    backgroundColor: "#ffa200",
-                    color: "#fff",
-                },
-            ],
-            btnIndex: 0, // 用户点击按钮事件判断 0：加入购物车；1：立即购买
-            type: null, // 商品类型，1零售 2批发 3精品 4今日值买
-            goodsId: "", // 商品ID
-            id: "", //合伙人套餐ID
-            detail: {
-                goods: {},
-            }, // 商品详情
-            checked: false, //是否选中协议
-            buyNum: 1, //购买数量
-            pfway: "0", // 批发
-            showAuth: false,
 
-            userinfo: {},
-            goodsDa: {},
-        };
+    //授权并登录
+    onAuthSuccess: function () {
+      var that = this;
+      uni.showLoading({ mask: true });
+      appEv.setData((res) => {
+        uni.hideLoading();
+        that.showAuth = false;
+      });
     },
-    onLoad: function(e) {
-        this.type = e.type;
-        this.goodsDa = e;
-        this.userinfo = uni.getStorageSync("userinfo");
-        this.loadData(e);
+    // 去购买
+    ToPayPage: function () {
+      if (!this.checked) {
+        appEv.errTips("请阅读并同意购买协议");
+        return;
+      }
+      this.toPayOrder();
+      //   if (this.btnIndex == 0) {
+      //     // if(this.type != 1){
+      //     this.toPayOrder();
+      //     // }else{
+      //     // 	this.SetCartGoodsList()
+      //     // }
+      //   } else {
+      //     this.toPayOrder();
+      //   }
     },
-    onShow: function() {},
-    methods: {
-        // 商品详情信息
-        loadData(da) {
-            post("goods/goodsDetail", da).then((res) => {
-                if (res.code === 0) {
-                    this.detail = res.data.data;
-                    let imgs = [];
-                    imgs.push(this.detail.original_img);
-                    imgs.push(...this.detail.goods_img);
-                    this.detail.goods_img = imgs;
-                } else {
-                    uni.showModal({
-                        title: "提示",
-                        content: res.msg,
-                        showCancel: false,
-                        success: function(res) {
-                            if (res) {
-                                uni.navigateBack({
-                                    delta: 1,
-                                });
-                            }
-                        },
-                    });
-                }
-            });
-        },
-
-        //授权并登录
-        onAuthSuccess: function() {
-            var that = this;
-            uni.showLoading({ mask: true });
-            appEv.setData((res) => {
-                uni.hideLoading();
-                that.showAuth = false;
-            });
-        },
-        // 去购买
-        ToPayPage: function() {
-            if (!this.checked) {
-                appEv.errTips("请阅读并同意购买协议");
-                return;
-            }
-            this.toPayOrder();
-            //   if (this.btnIndex == 0) {
-            //     // if(this.type != 1){
-            //     this.toPayOrder();
-            //     // }else{
-            //     //   this.SetCartGoodsList()
-            //     // }
-            //   } else {
-            //     this.toPayOrder();
-            //   }
-        },
-        // 创建购买订单
-        toPayOrder: function() {
-            this.goto("/pages/to-pay-list/index", {
-                ...this.goodsDa,
-                is_sell: this.pfway,
-                num: this.buyNum,
-            });
-        },
-        // 添加到购物车
-        SetCartGoodsList: function() {
-            let that = this;
-            let data = {
-                goodsId: this.goodsId,
-                buyCount: this.buyNum,
-                specialArea: this.type,
-            };
-            u_post("ShuZiTeaYW/shop/conShoppingCart", data).then((res) => {
-                if (res.status == 200) {
-                    appEv.errTips("添加成功");
-                    that.checked = false;
-                    that.buyNum = 1;
-                    that.$refs.shopping.close();
-                } else {
-                    appEv.errTips(res.msg);
-                }
-            });
-        },
-        // 购买数量更改
-        bindChange(e) {
-            this.buyNum = e;
-        },
-        // 更改批发方式
-        setWay(e) {
-            this.pfway = e;
-        },
-        // 点击同意协议
-        checkboxChange(e) {
-            let index = e.detail.value.indexOf("1");
-            if (index != -1) {
-                this.checked = true;
-            } else {
-                this.checked = false;
-            }
-        },
-        // 点击底部主页购物车等按钮
-        onClick(e) {
-            if (e.index === 0) {
-                uni.switchTab({ url: "/pages/index/index" });
-            }
-        },
-        // 点击立即购买或加入购物车
-        buttonClick: function(e) {
-            this.btnIndex = e.index;
-            this.$refs.shopping.open();
-        },
-        // 点击关闭弹窗
-        closeBtn: function() {
-            this.$refs.shopping.close();
-        },
-        getProPage: function() {
-            if (this.type == 1 || this.type == 2) {
-                uni.navigateTo({
-                    url: "/pages/protocol/index?type=" + this.type,
-                });
-            } else if (this.type == 4) {
-                uni.navigateTo({
-                    url: "/pages/protocol/index?type=" + 3,
-                });
-            } else if (this.type == 3) {
-                uni.navigateTo({
-                    url: "/pages/protocol/index?type=" + 5,
-                });
-            }
-        },
+    // 创建购买订单
+    toPayOrder: function () {
+      this.goto("/pages/to-pay-list/index", {
+        ...this.goodsDa,
+        is_sell: this.pfway,
+        num: this.buyNum,
+      });
     },
-    onShareAppMessage: function() {
-        let userinfo = uni.getStorageSync("userinfo");
-        var path = "/pages/product/p_details?agentId=1";
-        if (userinfo.user_id) {
-            path = "/pages/product/p_details?agentId=" + userinfo.user_id;
+    // 添加到购物车
+    SetCartGoodsList: function () {
+      let that = this;
+      let data = {
+        goodsId: this.goodsId,
+        buyCount: this.buyNum,
+        specialArea: this.type,
+      };
+      u_post("ShuZiTeaYW/shop/conShoppingCart", data).then((res) => {
+        if (res.status == 200) {
+          appEv.errTips("添加成功");
+          that.checked = false;
+          that.buyNum = 1;
+          that.$refs.shopping.close();
+        } else {
+          appEv.errTips(res.msg);
         }
-        var title = `让数字经济赋能美好生活！`;
-        return {
-            title: title,
-            path: path,
-        };
+      });
+    },
+    // 购买数量更改
+    bindChange(e) {
+      this.buyNum = e;
+    },
+    // 更改批发方式
+    setWay(e) {
+      this.pfway = e;
+    },
+    // 点击同意协议
+    checkboxChange(e) {
+      let index = e.detail.value.indexOf("1");
+      if (index != -1) {
+        this.checked = true;
+      } else {
+        this.checked = false;
+      }
+    },
+    // 点击底部主页购物车等按钮
+    onClick(e) {
+      if (e.index === 0) {
+        uni.switchTab({ url: "/pages/index/index" });
+      }
+    },
+    // 点击立即购买或加入购物车
+    buttonClick: function (e) {
+      this.btnIndex = e.index;
+      this.$refs.shopping.open();
     },
+    // 点击关闭弹窗
+    closeBtn: function () {
+      this.$refs.shopping.close();
+    },
+    getProPage() {
+      // if (this.type == 1 || this.type == 2) {
+      //   uni.navigateTo({
+      //     url: "/pages/protocol/index?type=" + this.type,
+      //   });
+      // } else if (this.type == 4) {
+      //   uni.navigateTo({
+      //     url: "/pages/protocol/index?type=" + 3,
+      //   });
+      // } else if (this.type == 3) {
+      //   uni.navigateTo({
+      //     url: "/pages/protocol/index?type=" + 5,
+      //   });
+      // }
+      console.log("aaaaaaaaaa");
+      uni.navigateTo({
+        url: "/pages/pay-agreement/index",
+      });
+    },
+  },
+  onShareAppMessage: function () {
+    let userinfo = uni.getStorageSync("userinfo");
+    var path = "/pages/product/p_details?agentId=1";
+    if (userinfo.user_id) {
+      path = "/pages/product/p_details?agentId=" + userinfo.user_id;
+    }
+    var title = `让数字经济赋能美好生活！`;
+    return {
+      title: title,
+      path: path,
+    };
+  },
 };
 </script>
+
 <style lang="scss">
 // 页面配置
 page {
-    background: #f5f5f5;
+  background: #f5f5f5;
 }
-
 .container {
-    padding-bottom: 90rpx;
+  padding-bottom: 90rpx;
 }
-
 // 页面配置-end
 
 // 价格信息栏
 .price_span {
-    width: 283rpx;
-    height: 100%;
-    position: relative;
+  width: 283rpx;
+  height: 100%;
+  position: relative;
 }
-
 .price text {
-    font-size: 24rpx;
-    color: #fff;
-    font-family: "SourceHanSansCN-Medium";
+  font-size: 24rpx;
+  color: #fff;
+  font-family: "SourceHanSansCN-Medium";
 }
-
 .price_info {
-    background: #ff6d44;
-    height: 92rpx;
-    width: 100%;
-    box-sizing: border-box;
+  background: #ff6d44;
+  height: 92rpx;
+  width: 100%;
+  box-sizing: border-box;
 }
-
 .price {
-    font-size: 38rpx;
-    color: #fff;
-    font-family: "SourceHanSansCN-Medium";
-    margin-left: 20rpx;
+  font-size: 38rpx;
+  color: #fff;
+  font-family: "SourceHanSansCN-Medium";
+  margin-left: 20rpx;
 }
-
 .span_conten {
-    width: calc(283rpx - 46rpx);
-    height: 100%;
-    background: #ffcabb;
-    position: relative;
-    font-size: 34rpx;
-    font-family: "SourceHanSansCN-Medium";
-    color: #682918;
+  width: calc(283rpx - 46rpx);
+  height: 100%;
+  background: #ffcabb;
+  position: relative;
+  font-size: 34rpx;
+  font-family: "SourceHanSansCN-Medium";
+  color: #682918;
 }
-
 .triangle {
-    width: 0px;
-    height: 0px;
-    border-top: 92rpx solid rgba(0, 0, 0, 0);
-    border-right: 92rpx solid rgba(0, 0, 0, 0);
-    border-bottom: 92rpx solid #ffcabb;
-    border-left: 92rpx solid rgba(0, 0, 0, 0);
-    transform: translate(-46rpx, -92rpx);
-    position: absolute;
-    top: 0;
-    left: 0;
+  width: 0px;
+  height: 0px;
+  border-top: 92rpx solid rgba(0, 0, 0, 0);
+  border-right: 92rpx solid rgba(0, 0, 0, 0);
+  border-bottom: 92rpx solid #ffcabb;
+  border-left: 92rpx solid rgba(0, 0, 0, 0);
+  transform: translate(-46rpx, -92rpx);
+  position: absolute;
+  top: 0;
+  left: 0;
 }
-
 .samll {
-    font-size: 28rpx;
-    max-width: calc(100% - 360rpx);
-    line-height: 1.3;
-    text-align: justify;
+  font-size: 28rpx;
+  max-width: calc(100% - 360rpx);
+  line-height: 1.3;
+  text-align: justify;
 }
-
 // 价格信息栏-end
 
 // 标题信息栏
 .goods_subName {
-    width: 100%;
-    overflow: hidden;
-    font-size: 22rpx;
-    color: #787878;
+  width: 100%;
+  overflow: hidden;
+  font-size: 22rpx;
+  color: #787878;
 }
-
 .title_info {
-    width: 100%;
-    overflow: hidden;
-    background: #ffffff;
-    padding: 20rpx;
-    box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  background: #ffffff;
+  padding: 20rpx;
+  box-sizing: border-box;
 }
-
 .goods_name {
-    width: 100%;
-    overflow: hidden;
-    font-size: 32rpx;
-    color: #1b1b1b;
-    font-family: "SourceHanSansCN-Bold";
-    font-weight: bold;
-    margin-bottom: 20rpx;
+  width: 100%;
+  overflow: hidden;
+  font-size: 32rpx;
+  color: #1b1b1b;
+  font-family: "SourceHanSansCN-Bold";
+  font-weight: bold;
+  margin-bottom: 20rpx;
 }
-
 // 标题信息栏-end
 
 // 产品简介
 .brief {
-    width: 100%;
-    overflow: hidden;
-    background-color: #fff;
+  width: 100%;
+  overflow: hidden;
+  background-color: #fff;
 }
-
 .brief_con {
-    width: 100%;
-    overflow: hidden;
-    padding: 20rpx;
-    box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  padding: 20rpx;
+  box-sizing: border-box;
 }
-
 .brief_title {
-    width: 100%;
-    overflow: hidden;
-    font-size: 26rpx;
-    color: #1b1b1b;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-    border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
-    height: 74rpx;
+  width: 100%;
+  overflow: hidden;
+  font-size: 26rpx;
+  color: #1b1b1b;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
+  height: 74rpx;
 }
-
 // 产品简介-end
 
 // 底部导航组件
 .option {
-    position: fixed;
-    width: 100%;
-    overflow: hidden;
-    left: 0;
-    bottom: 0;
+  position: fixed;
+  width: 100%;
+  overflow: hidden;
+  left: 0;
+  bottom: 0;
 }
-
 // 底部导航组件-end
 
 // 购买或加入购物车弹窗
 .option_box text {
-    color: #2db389;
+  color: #2db389;
 }
-
 .goods_raido {
-    margin-right: 180rpx;
+  margin-right: 180rpx;
 }
-
 .close_img {
-    width: 36rpx;
-    height: 36rpx;
+  width: 36rpx;
+  height: 36rpx;
 }
-
 .option_box {
-    font-size: 26rpx;
-    margin-top: 80rpx;
+  font-size: 26rpx;
+  margin-top: 80rpx;
 }
-
 .goods_raido:nth-last-child(1) {
-    margin-right: 0;
+  margin-right: 0;
 }
-
 .num_con {
-    width: 100%;
-    overflow: hidden;
-    padding-bottom: 3rpx;
+  width: 100%;
+  overflow: hidden;
+  padding-bottom: 3rpx;
 }
-
 .goods_option {
-    width: 100%;
-    overflow: hidden;
-    padding-top: 50rpx;
+  width: 100%;
+  overflow: hidden;
+  padding-top: 50rpx;
 }
-
 .close_con {
-    width: 100%;
-    overflow: hidden;
-    margin-bottom: 35rpx;
+  width: 100%;
+  overflow: hidden;
+  margin-bottom: 35rpx;
 }
-
 .raido_text {
-    font-size: 26rpx;
-    color: #545454;
-    margin-left: 30rpx;
+  font-size: 26rpx;
+  color: #545454;
+  margin-left: 30rpx;
 }
-
 .goods_con {
-    width: calc(100% - 202rpx - 30rpx);
-    overflow: hidden;
+  width: calc(100% - 202rpx - 30rpx);
+  overflow: hidden;
 }
-
 .goods_img {
-    width: 202rpx;
-    height: 140rpx;
-    margin-right: 30rpx;
-    border-radius: 12rpx;
+  width: 202rpx;
+  height: 140rpx;
+  margin-right: 30rpx;
+  border-radius: 12rpx;
 }
-
 .confim {
-    width: 100%;
-    height: 60rpx;
-    border-radius: 30rpx;
-    background: #2db389;
-    color: #fff;
-    font-size: 26rpx;
-    margin-top: 44rpx;
+  width: 100%;
+  height: 60rpx;
+  border-radius: 30rpx;
+  background: #2db389;
+  color: #fff;
+  font-size: 26rpx;
+  margin-top: 44rpx;
 }
-
 .shopping {
-    width: 100%;
-    overflow: hidden;
-    padding: 20rpx;
-    box-sizing: border-box;
-    border-radius: 30rpx 30rpx 0 0;
-    background: #fff;
+  width: 100%;
+  overflow: hidden;
+  padding: 20rpx;
+  box-sizing: border-box;
+  border-radius: 30rpx 30rpx 0 0;
+  background: #fff;
 }
-
 .goods_info {
-    width: 100%;
-    overflow: hidden;
-    align-items: inherit;
-    padding-bottom: 48rpx;
-    border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
+  width: 100%;
+  overflow: hidden;
+  align-items: inherit;
+  padding-bottom: 48rpx;
+  border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
 }
-
 .shop_names {
-    width: 100%;
-    overflow: hidden;
-    font-family: "SourceHanSansCN-Bold";
-    font-weight: bold;
-    color: #1b1b1b;
-    font-size: 32rpx;
+  width: 100%;
+  overflow: hidden;
+  font-family: "SourceHanSansCN-Bold";
+  font-weight: bold;
+  color: #1b1b1b;
+  font-size: 32rpx;
 }
-
 .goods_msg {
-    width: 100%;
-    overflow: hidden;
-    font-size: 28rpx;
-    color: #18bb88;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: 500;
+  width: 100%;
+  overflow: hidden;
+  font-size: 28rpx;
+  color: #18bb88;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: 500;
 }
-
 .raido_img {
-    width: 39rpx;
-    height: 35rpx;
-    background: url(~@/static/img/weixuanzhong.png);
-    background-repeat: no-repeat;
-    background-size: 35rpx 35rpx;
-    background-position: center center;
+  width: 39rpx;
+  height: 35rpx;
+  background: url(~@/static/img/weixuanzhong.png);
+  background-repeat: no-repeat;
+  background-size: 35rpx 35rpx;
+  background-position: center center;
 }
 
 .raido_box {
-    background: url(~@/static/img/consent.png);
-    background-repeat: no-repeat;
-    background-size: 39rpx 35rpx;
-    background-position: center center;
+  background: url(~@/static/img/consent.png);
+  background-repeat: no-repeat;
+  background-size: 39rpx 35rpx;
+  background-position: center center;
 }
-
 // 购买或加入购物车弹窗-end
-</style>
+</style>