购物车结算原来是amount: this.data.amount

 {
 {
-        "pages": [
-                "pages/start/start",
-                "pages/index/index",
-                "pages/my/orderDetail/orderDetail",
-                "pages/my/big/big",
-                "pages/my/activityInformation/activityInformation",
-                "pages/my/serach/serach",
-                "pages/my/selectAddress/selectAddress",
-                "pages/my/editAddress2/editAddress2",
-                "pages/my/edit_address/edit_address",
-                "pages/my/editAddress/editAddress",
-                "pages/my/myOrder/myOrder",
-                "pages/index/production_steps/production_steps",
-                "pages/my/myCollection/myCollection",
-                "pages/index/goodsDetial2/goodsDetial2",
-                "pages/index/goodsDetial/goodsDetial",
-                "pages/my/modifyPersonInformation/modifyPersonInformation",
-                "pages/my/modifyName/modifyName",
-                "pages/my/invitationList/invitationList",
-                "pages/my/invoiceInformation/invoiceInformation",
-                "pages/my/invoice/invoice",
-                "pages/my/commonProblems/commonProblems",
-                "pages/my/myAddress/myAddress",
-                "pages/my/invitationPolite/invitationPolite",
-                "pages/my/comment/comment",
-                "pages/my/coupons/coupons",
-                "pages/my/balance _center2/balance _center2",
-                "pages/my/charger_code/charger_code",
-                "pages/my/balance _center/balance _center",
-                "pages/my/my",
-                "pages/cart/cart",
-                "pages/index/selectAddress/selectAddress",
-                "pages/my/newAddress/newAddress",
-                "pages/my/modifyPhone/modifyPhone",
-                "pages/my/personal_center/personal_center",
-                "pages/my/showComment/showComment",
-                "pages/index/replaceDishes/replaceDishes",
-                "pages/cart/mask/mask",
-                "pages/my/question_two/question_two",
-                "pages/my/cancelOrder/cancelOrder",
-                "pages/my/deliveryTime/deliveryTime",
-                "pages/my/settle_account/settle_account",
-                "pages/my/notice_detail/notice_detail",
-                "pages/index/select_index/select_index",
-                "pages/my/agreement/agreement/agreement",
-                "pages/vip/vip_index/vip_index",
-                "pages/my/suggestion/suggestion",
-                "pages/index/special_list/special_list",
-                "pages/my/myCollections/myCollections",
-                "pages/my/unpayOrderDetail/unpayOrderDetail",
-                "pages/index/user_comment/user_comment",
-                "pages/index/safty/safty",
-                "pages/index/search_result/search_result",
-                "pages/index/searchResultByScreen/searchResultByScreen",
-                "pages/my/Aftermarket/Aftermarket",
-                "pages/my/afterMarketList/afterMarketList",
-                "pages/my/aftermarketDetail/aftermarketDetail",
-                "pages/my/unship/unship",
-                "pages/my/uncomment/uncomment",
-                "pages/index/search_select_result/search_select_result",
-                "pages/my/wait_receite/wait_receite",
-                "pages/index/pay_ensure/pay_ensure",
-                "pages/index/select_source/select_source",
-                "pages/index/safetyDetail/safetyDetail",
-                "pages/index/foodPackageDetial/foodPackageDetial",
-                "pages/my/invoiceList/invoiceList",
-                "pages/vip/detail_vip/detail_vip",
-                "pages/index/goodsDetials/goodsDetials",
-                "pages/navigate/navigate",
-                "pages/index/user_comment_detail/user_comment_detail"
-        ],
-        "window": {
-                "backgroundTextStyle": "dark",
-                "navigationBarBackgroundColor": "#1a191f",
-                "navigationBarTitleText": "HI，鲜生",
-                "navigationBarTextStyle": "white"
-        },
-        "permission": {
-                "scope.userLocation": {
-                        "desc": "你的位置信息将用于小程序位置接口的效果展示"
-                }
-        },
-        "tabBar": {
-                "selectedColor": "#222222",
-                "list": [
-                        {
-                                "selectedIconPath": "pages/imgs/nav02@2x.png",
-                                "iconPath": "pages/imgs/nav01@2x.png",
-                                "pagePath": "pages/index/index",
-                                "text": "首页"
-                        },
-                        {
-                                "selectedIconPath": "pages/imgs/nav04@2x.png",
-                                "iconPath": "pages/imgs/nav03@2x.png",
-                                "pagePath": "pages/cart/cart",
-                                "text": "购物车"
-                        },
-                        {
-                                "selectedIconPath": "pages/imgs/nav06@2x.png",
-                                "iconPath": "pages/imgs/nav05@2x.png",
-                                "pagePath": "pages/my/my",
-                                "text": "个人中心"
-                        }
-                ]
-        },
-        "networkTimeout": {
-                "request": 1000,
-                "connectSocket": 1000,
-                "uploadFile": 1000,
-                "downloadFile": 1000
-        },
-        "sitemapLocation": "sitemap.json"
+    "pages": [
+        "pages/start/start",
+        "pages/index/index",
+        "pages/my/orderDetail/orderDetail",
+        "pages/my/big/big",
+        "pages/my/activityInformation/activityInformation",
+        "pages/my/serach/serach",
+        "pages/my/selectAddress/selectAddress",
+        "pages/my/editAddress2/editAddress2",
+        "pages/my/edit_address/edit_address",
+        "pages/my/editAddress/editAddress",
+        "pages/my/myOrder/myOrder",
+        "pages/index/production_steps/production_steps",
+        "pages/my/myCollection/myCollection",
+        "pages/index/goodsDetial2/goodsDetial2",
+        "pages/index/goodsDetial/goodsDetial",
+        "pages/my/modifyPersonInformation/modifyPersonInformation",
+        "pages/my/modifyName/modifyName",
+        "pages/my/invitationList/invitationList",
+        "pages/my/invoiceInformation/invoiceInformation",
+        "pages/my/invoice/invoice",
+        "pages/my/commonProblems/commonProblems",
+        "pages/my/myAddress/myAddress",
+        "pages/my/invitationPolite/invitationPolite",
+        "pages/my/comment/comment",
+        "pages/my/coupons/coupons",
+        "pages/my/balance _center2/balance _center2",
+        "pages/my/charger_code/charger_code",
+        "pages/my/balance _center/balance _center",
+        "pages/my/my",
+        "pages/cart/cart",
+        "pages/index/selectAddress/selectAddress",
+        "pages/my/newAddress/newAddress",
+        "pages/my/modifyPhone/modifyPhone",
+        "pages/my/personal_center/personal_center",
+        "pages/my/showComment/showComment",
+        "pages/index/replaceDishes/replaceDishes",
+        "pages/cart/mask/mask",
+        "pages/my/question_two/question_two",
+        "pages/my/cancelOrder/cancelOrder",
+        "pages/my/deliveryTime/deliveryTime",
+        "pages/my/settle_account/settle_account",
+        "pages/my/notice_detail/notice_detail",
+        "pages/index/select_index/select_index",
+        "pages/my/agreement/agreement/agreement",
+        "pages/vip/vip_index/vip_index",
+        "pages/my/suggestion/suggestion",
+        "pages/index/special_list/special_list",
+        "pages/my/myCollections/myCollections",
+        "pages/my/unpayOrderDetail/unpayOrderDetail",
+        "pages/index/user_comment/user_comment",
+        "pages/index/safty/safty",
+        "pages/index/search_result/search_result",
+        "pages/index/searchResultByScreen/searchResultByScreen",
+        "pages/my/Aftermarket/Aftermarket",
+        "pages/my/afterMarketList/afterMarketList",
+        "pages/my/aftermarketDetail/aftermarketDetail",
+        "pages/my/unship/unship",
+        "pages/my/uncomment/uncomment",
+        "pages/index/search_select_result/search_select_result",
+        "pages/my/wait_receite/wait_receite",
+        "pages/index/pay_ensure/pay_ensure",
+        "pages/index/select_source/select_source",
+        "pages/index/safetyDetail/safetyDetail",
+        "pages/index/foodPackageDetial/foodPackageDetial",
+        "pages/my/invoiceList/invoiceList",
+        "pages/vip/detail_vip/detail_vip",
+        "pages/index/goodsDetials/goodsDetials",
+        "pages/navigate/navigate",
+        "pages/index/user_comment_detail/user_comment_detail",
+        "pages/my/paySuccess/paySuccess"
+    ],
+    "window": {
+        "backgroundTextStyle": "dark",
+        "navigationBarBackgroundColor": "#1a191f",
+        "navigationBarTitleText": "HI，鲜生",
+        "navigationBarTextStyle": "white"
+    },
+    "permission": {
+        "scope.userLocation": {
+            "desc": "你的位置信息将用于小程序位置接口的效果展示"
+        }
+    },
+    "tabBar": {
+        "selectedColor": "#222222",
+        "list": [
+            {
+                "selectedIconPath": "pages/imgs/nav02@2x.png",
+                "iconPath": "pages/imgs/nav01@2x.png",
+                "pagePath": "pages/index/index",
+                "text": "首页"
+            },
+            {
+                "selectedIconPath": "pages/imgs/nav04@2x.png",
+                "iconPath": "pages/imgs/nav03@2x.png",
+                "pagePath": "pages/cart/cart",
+                "text": "购物车"
+            },
+            {
+                "selectedIconPath": "pages/imgs/nav06@2x.png",
+                "iconPath": "pages/imgs/nav05@2x.png",
+                "pagePath": "pages/my/my",
+                "text": "个人中心"
+            }
+        ]
+    },
+    "networkTimeout": {
+        "request": 1000,
+        "connectSocket": 1000,
+        "uploadFile": 1000,
+        "downloadFile": 1000
+    },
+    "sitemapLocation": "sitemap.json"
 }
 }

@@ -9,12 +9,12 @@
 
 
 @font-face {
 @font-face {
   font-family: 'iconfont';  /* project id 636259 */
   font-family: 'iconfont';  /* project id 636259 */
-  src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot');
-  src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff') format('woff'),
-  url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot');
+  src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff') format('woff'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.svg#iconfont') format('svg');
 }
 }
 /**
 /**
  * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
  * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
@@ -255,20 +255,25 @@ input, textarea {
 }
 }
 
 
 .good_btn {
 .good_btn {
-    height: 60rpx;
-    width: 60rpx;
+    height: 100rpx;
+    width: 100rpx;
+    padding: 20rpx;
+    box-sizing: border-box;
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: center;
     justify-content: center;
-    border-radius: 50%;
-    background-color: #ffda44;
-    box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3);
+    text-align: center;
 }
 }
 
 
 .icon-gouwuche {
 .icon-gouwuche {
     font-size: 29rpx;
     font-size: 29rpx;
+    line-height: 60rpx;
     color: #444;
     color: #444;
-    
+    width:60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+    background-color: #ffda44;
+    box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3);
 }
 }
 
 
 /* 头部信息 */
 /* 头部信息 */
@@ -307,13 +312,15 @@ input, textarea {
 
 
 
 
 
 
+
 @font-face {
 @font-face {
   font-family: 'iconfont';  /* project id 636259 */
   font-family: 'iconfont';  /* project id 636259 */
-  src: url('//at.alicdn.com/t/font_636259_xrf3sdkafk.eot');
-  src: url('//at.alicdn.com/t/font_636259_xrf3sdkafk.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_636259_xrf3sdkafk.woff') format('woff'),
-  url('//at.alicdn.com/t/font_636259_xrf3sdkafk.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_636259_xrf3sdkafk.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot');
+  src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff') format('woff'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.svg#iconfont') format('svg');
 }
 }
 
 
 
 
@@ -604,6 +611,10 @@ input, textarea {
           content: "\e63b"
           content: "\e63b"
 }
 }
 
 
+.icon-duigoua:before{
+          content: "\e63c"
+}
+
 
 
 
 
 
 

@@ -3,7 +3,7 @@ const app = getApp();
 Page({
 Page({
 
 
         /**
         /**
-         * 页面的初始数据
+         * 页面的初始数据 
          */
          */
         data: {
         data: {
                 imgUrl: app.globalData.imgUrl,
                 imgUrl: app.globalData.imgUrl,
@@ -150,6 +150,9 @@ Page({
                                         showList.push(ele)
                                         showList.push(ele)
                                 }
                                 }
                                 ele.t = false
                                 ele.t = false
+                                if(indexxx<r.data.info.num){
+                                    ele.t=true
+                                }
                                 ele.attr.attr_sku.forEach(function (eles, indexxxx) {
                                 ele.attr.attr_sku.forEach(function (eles, indexxxx) {
                                         for (let i = 0; i < eles.item.length; i++) {
                                         for (let i = 0; i < eles.item.length; i++) {
                                                 eles.item[i].t = false
                                                 eles.item[i].t = false
@@ -273,7 +276,7 @@ Page({
                 })
                 })
                 if ((n < goods.info.num && n > 0) || n > goods.info.num) {
                 if ((n < goods.info.num && n > 0) || n > goods.info.num) {
                         wx.showToast({
                         wx.showToast({
-                                title: '请选择' + num + '种商品',
+                                title: '您最多只能选择' + num + '种商品',
                                 icon: 'none'
                                 icon: 'none'
                         })
                         })
                         return;
                         return;
@@ -487,11 +490,19 @@ Page({
                 let indexs = e.currentTarget.dataset.index
                 let indexs = e.currentTarget.dataset.index
                 let that = this
                 let that = this
                 let list = that.data.packageList
                 let list = that.data.packageList
+                let n=0
                 list.forEach(function (ele, index) {
                 list.forEach(function (ele, index) {
                         if (indexs == index) {
                         if (indexs == index) {
-                                console.log(ele.t + "之前")
                                 ele.t = !ele.t
                                 ele.t = !ele.t
-                                console.log(ele.t + "之后")
+                        }
+                        if(ele.t){
+                            n++
+                        }
+                        if(n>that.data.goods.info.num){
+                            wx.showToast({
+                                title: '您最多可选择'+that.data.goods.info.num+'种商品',
+                                icon:'none'
+                            })
                         }
                         }
                 })
                 })
                 that.setData({
                 that.setData({

@@ -3,7 +3,7 @@
                 <view class='detail_container {{show||shows?"active":""}}'>
                 <view class='detail_container {{show||shows?"active":""}}'>
                         <view class='banner' wx:if='{{!showMore}}'>
                         <view class='banner' wx:if='{{!showMore}}'>
                                 <view class='iconfont icon-fanhui' catchtap='get_back'></view>
                                 <view class='iconfont icon-fanhui' catchtap='get_back'></view>
-                                <view class='coupons'> 
+                                <view class='coupons'>  
                                         <view class='goods_detail {{active?"active":""}}' bindtap='jump_goods'>商品详情</view>
                                         <view class='goods_detail {{active?"active":""}}' bindtap='jump_goods'>商品详情</view>
                                         <view class='graphic_detail {{!active?"active":""}}' bindtap='jump_detail'>图文详情</view>
                                         <view class='graphic_detail {{!active?"active":""}}' bindtap='jump_detail'>图文详情</view>
                                 </view>
                                 </view>
@@ -201,6 +201,7 @@
         <view class='banner'>
         <view class='banner'>
                 <view class='iconfont icon-fanhui' catchtap='closeShowMore'></view>
                 <view class='iconfont icon-fanhui' catchtap='closeShowMore'></view>
                 <view class='coupons'>商品详情</view>
                 <view class='coupons'>商品详情</view>
+                <view class='share' catchtap='closeShowMore'>确定</view>
         </view>
         </view>
         <view class='explaina'>
         <view class='explaina'>
                 <view class='explain_one'>
                 <view class='explain_one'>
@@ -213,7 +214,7 @@
         </view>
         </view>
         <view class='three'>
         <view class='three'>
                 <view class='collocation_boxa' wx:for='{{packageList}}' wx:for-index='index' wx:key='{{index}}' bindtap='goDetail' data-id='{{item.id}}'>
                 <view class='collocation_boxa' wx:for='{{packageList}}' wx:for-index='index' wx:key='{{index}}' bindtap='goDetail' data-id='{{item.id}}'>
-                        <view class='iconfont icon-weixuanzhong {{item.t?"active":""}}' catchtap='changeFlag' data-index='{{index}}'></view>
+                        <view class='iconfont icon-weixuanzhong xuanzhongda {{item.t?"active":""}}' catchtap='changeFlag' data-index='{{index}}'></view>
                         <view class='collocation_img'>
                         <view class='collocation_img'>
                                 <image src='{{item.more.thumbnail}}'></image>
                                 <image src='{{item.more.thumbnail}}'></image>
                         </view>
                         </view>

 /* pages/index/goodsDetial/goodsDetial.wxss */
 /* pages/index/goodsDetial/goodsDetial.wxss */
 
 
 page {
 page {
-        background:  #f3f5f5;
-        width: 100%;
-        height: 100%;
+    background: #f3f5f5;
+    width: 100%;
+    height: 100%;
 }
 }
-.page{
-        width: 100%;
-        height: 100%
+
+.page {
+    width: 100%;
+    height: 100%;
 }
 }
-.page.active{
-        overflow: hidden
+
+.page.active {
+    overflow: hidden;
 }
 }
+
 .big_box {
 .big_box {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .detail_container {
 .detail_container {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .detail_container.active {
 .detail_container.active {
-        overflow: hidden;
+    overflow: hidden;
 }
 }
 
 
 .coupons {
 .coupons {
-        font-size: 30rpx;
-        color: #222;
-        display: flex;
+    font-size: 30rpx;
+    color: #222;
+    display: flex;
 }
 }
 
 
 .goods_detail {
 .goods_detail {
-        font-weight: bold;
+    font-weight: bold;
 }
 }
 
 
 .goods_detail.active {
 .goods_detail.active {
-        border-bottom: 3rpx solid #ffda44;
+    border-bottom: 3rpx solid #ffda44;
 }
 }
 
 
 .graphic_detail {
 .graphic_detail {
-        font-weight: bold;
-        margin-left: 56rpx;
+    font-weight: bold;
+    margin-left: 56rpx;
 }
 }
 
 
 .graphic_detail.active {
 .graphic_detail.active {
-        border-bottom: 3rpx solid #ffda44;
+    border-bottom: 3rpx solid #ffda44;
 }
 }
 
 
 .share {
 .share {
-        font-size: 28rpx;
-        color: #222;
+    font-size: 28rpx;
+    color: #222;
 }
 }
 
 
 .share_btn {
 .share_btn {
-        background: transparent;
-        padding: 0;
-        margin: 0;
-        border: 0 !important;
-        color: #222;
-        font-size: 28rpx;
-        margin-top: 10rpx;
+    background: transparent;
+    padding: 0;
+    margin: 0;
+    border: 0 !important;
+    color: #222;
+    font-size: 28rpx;
+    margin-top: 10rpx;
 }
 }
 
 
 .banner {
 .banner {
-        position: fixed;
-        z-index: 999999;
+    position: fixed;
+    z-index: 999999;
 }
 }
-.banner_box{
-        position: relative;
 
 
+.banner_box {
+    position: relative;
 }
 }
+
 .banner_img {
 .banner_img {
-        height: 630rpx;
-        padding-top: 80rpx;
-        box-sizing: border-box;
+    height: 630rpx;
+    padding-top: 80rpx;
+    box-sizing: border-box;
 }
 }
 
 
 .banner_img image {
 .banner_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .item_list {
 .item_list {
-        padding: 32rpx 25rpx;
-        background-color: #fff;
-        margin-bottom: 20rpx;
+    padding: 32rpx 25rpx;
+    background-color: #fff;
+    margin-bottom: 20rpx;
 }
 }
 
 
 .banner_title {
 .banner_title {
-        font-size: 34rpx;
-        color: #222;
+    font-size: 34rpx;
+    color: #222;
 }
 }
 
 
 .introduce {
 .introduce {
-        font-size: 28rpx;
-        color: #888;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        position: relative
+    font-size: 28rpx;
+    color: #888;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    position: relative;
 }
 }
 
 
 .banner_character {
 .banner_character {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 24rpx;
-        color: #888;
-        margin-top: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 24rpx;
+    color: #888;
+    margin-top: 40rpx;
 }
 }
 
 
 .banner_price {
 .banner_price {
-        display: flex;
-        align-items: center;
-        width: auto;
+    display: flex;
+    align-items: center;
+    width: auto;
 }
 }
 
 
 .money_icon {
 .money_icon {
-        font-size: 22rpx;
-        color: #222;
+    font-size: 22rpx;
+    color: #222;
 }
 }
 
 
 .money {
 .money {
-        font-size: 38rpx;
-        font-weight: bold;
-        color: #222;
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #222;
 }
 }
 
 
 .original_price {
 .original_price {
-        color: #888;
-        text-decoration: line-through;
+    color: #888;
+    text-decoration: line-through;
 }
 }
 
 
 .display_box {
 .display_box {
-        width: auto;
-        margin-left: 40rpx;
-        display: flex;
-        align-items: center
+    width: auto;
+    margin-left: 40rpx;
+    display: flex;
+    align-items: center;
 }
 }
 
 
 .money_icon2 {
 .money_icon2 {
-        font-size: 22rpx;
-        color: #f44;
+    font-size: 22rpx;
+    color: #f44;
 }
 }
 
 
 .money2 {
 .money2 {
-        font-size: 38rpx;
-        font-weight: bold;
-        color: #f44;
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #f44;
 }
 }
 
 
 .vip {
 .vip {
-        width: 80rpx;
-        height: 25rpx;
-        margin-left: 5rpx;
+    width: 80rpx;
+    height: 25rpx;
+    margin-left: 5rpx;
 }
 }
 
 
-.vip image{
-        width: 100%;
-        height: 100%
+.vip image {
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .list_content {
 .list_content {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 }
 
 
 .content_title {
 .content_title {
-        display: flex;
+    display: flex;
 }
 }
 
 
 .title {
 .title {
-        font-size: 24rpx;
-        color: #888;
+    font-size: 24rpx;
+    color: #888;
 }
 }
 
 
 .content {
 .content {
-        font-size: 24rpx;
-        color: #222;
-        margin-left: 47rpx;
+    font-size: 24rpx;
+    color: #222;
+    margin-left: 47rpx;
 }
 }
 
 
 .icon-jinru {
 .icon-jinru {
-        font-size: 22rpx;
-        color: #c7c7c7;
+    font-size: 22rpx;
+    color: #c7c7c7;
 }
 }
 
 
 .more_box {
 .more_box {
-        font-size: 24rpx;
-        color: #949a9a;
-        border-top: 1rpx solid #ededed;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding-top: 24rpx;
-        margin-top: 35rpx;
+    font-size: 24rpx;
+    color: #949a9a;
+    border-top: 1rpx solid #ededed;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-top: 24rpx;
+    margin-top: 35rpx;
 }
 }
 
 
 .icon-zhankai {
 .icon-zhankai {
-        font-size: 14rpx;
-        margin-left: 10rpx;
+    font-size: 14rpx;
+    margin-left: 10rpx;
 }
 }
 
 
 .item_list1 {
 .item_list1 {
-        background-color: #fff;
-        margin-bottom: 20rpx;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 19rpx 16rpx;
+    background-color: #fff;
+    margin-bottom: 20rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 19rpx 16rpx;
 }
 }
 
 
 .hint1 {
 .hint1 {
-        font-size: 22rpx;
-        color: #222;
-        background-color: #fafafa;
-        border-radius: 12rpx;
-        padding: 25rpx 39rpx;
+    font-size: 22rpx;
+    color: #222;
+    background-color: #fafafa;
+    border-radius: 12rpx;
+    padding: 25rpx 39rpx;
 }
 }
 
 
 .cash_back {
 .cash_back {
-        font-size: 28rpx;
-        font-weight: bold;
-        color: #222;
+    font-size: 28rpx;
+    font-weight: bold;
+    color: #222;
 }
 }
 
 
 .red_font {
 .red_font {
-        font-weight: bold;
-        color: #f44;
+    font-weight: bold;
+    color: #f44;
 }
 }
 
 
 .item_list7 {
 .item_list7 {
-        padding: 31rpx 25rpx 25rpx 25rpx;
+    padding: 31rpx 25rpx 25rpx 25rpx;
 }
 }
 
 
 .attribute {
 .attribute {
-        width: 375rpx;
-        display: flex;
-        align-items: center;
-        /* margin-left: 49rpx; */
+    width: 375rpx;
+    display: flex;
+    align-items: center;
+    /* margin-left: 49rpx; */
 }
 }
 
 
 .attribute_titel {
 .attribute_titel {
-        font-size: 26rpx;
-        color: #94999a;
+    font-size: 26rpx;
+    color: #94999a;
 }
 }
 
 
 .stars {
 .stars {
-        display: flex;
-        font-size: 26rpx;
-        color: #222;
-        margin-left: 35rpx;
+    display: flex;
+    font-size: 26rpx;
+    color: #222;
+    margin-left: 35rpx;
 }
 }
 
 
 .icon-pingfen {
 .icon-pingfen {
-        font-size: 26rpx;
-        color: #222;
+    font-size: 26rpx;
+    color: #222;
 }
 }
 
 
 .attribute_content {
 .attribute_content {
-        font-size: 26rpx;
-        color: #222;
-        margin-left: 113rpx;
+    font-size: 26rpx;
+    color: #222;
+    margin-left: 113rpx;
 }
 }
 
 
-.item_list2, .item_list3, .item_list4, .itme_list5, .item_list6, .item_list7 , .item_list10 {
-        background-color: #fff;
-        margin-bottom: 20rpx;
+.item_list2, .item_list3, .item_list4, .itme_list5, .item_list6, .item_list7,
+.item_list10 {
+    background-color: #fff;
+    margin-bottom: 20rpx;
 }
 }
 
 
 .user_evaluation {
 .user_evaluation {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        border-bottom: 1rpx solid #f3f5f5;
-        padding: 31rpx 25rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1rpx solid #f3f5f5;
+    padding: 31rpx 25rpx;
 }
 }
 
 
 .user_evaluation_title {
 .user_evaluation_title {
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #222;
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #222;
 }
 }
 
 
 .user_evaluation_time {
 .user_evaluation_time {
-        font-size: 24rpx;
-        color: #c7c7c7;
-        display: flex;
-        align-items: center;
+    font-size: 24rpx;
+    color: #c7c7c7;
+    display: flex;
+    align-items: center;
 }
 }
 
 
 .comments_btn {
 .comments_btn {
-        display: flex;
-        justify-content: flex-end;
-        align-items: center;
-        font-size: 23rpx;
-        color: #949a9a;
-        margin-top: 24rpx;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    font-size: 23rpx;
+    color: #949a9a;
+    margin-top: 24rpx;
 }
 }
 
 
 .icon-message {
 .icon-message {
-        font-size: 22rpx;
-        color: #949a9a;
-        margin-right: 10rpx;
+    font-size: 22rpx;
+    color: #949a9a;
+    margin-right: 10rpx;
 }
 }
 
 
 .user_information_box {
 .user_information_box {
-        padding: 31rpx 25rpx 25rpx 25rpx;
+    padding: 31rpx 25rpx 25rpx 25rpx;
 }
 }
 
 
 .user_information {
 .user_information {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 }
 
 
 .head_portrait {
 .head_portrait {
-        width: 62rpx;
-        height: 62rpx;
+    width: 62rpx;
+    height: 62rpx;
 }
 }
 
 
 .head_portrait image {
 .head_portrait image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .star_box {
 .star_box {
-        margin-left: 25rpx;
+    margin-left: 25rpx;
 }
 }
 
 
 .the_star {
 .the_star {
-        display: flex;
-        align-items: center;
+    display: flex;
+    align-items: center;
 }
 }
 
 
 .stars1 {
 .stars1 {
-        display: flex;
+    display: flex;
 }
 }
 
 
 .user_name {
 .user_name {
-        font-size: 26rpx;
-        color: #222;
+    font-size: 26rpx;
+    color: #222;
 }
 }
 
 
 .evaluation {
 .evaluation {
-        font-size: 24rpx;
-        color: #222;
-        margin-top: 25rpx;
+    font-size: 24rpx;
+    color: #222;
+    margin-top: 25rpx;
 }
 }
 
 
 .evaluation_img {
 .evaluation_img {
-        margin-top: 21rpx;
+    margin-top: 21rpx;
 }
 }
 
 
 .upload_img_box {
 .upload_img_box {
-        display: flex;
+    display: flex;
 }
 }
 
 
 .upload_img {
 .upload_img {
-        width: 160rpx;
-        height: 160rpx;
-        margin-right: 20rpx;
+    width: 160rpx;
+    height: 160rpx;
+    margin-right: 20rpx;
 }
 }
 
 
 .upload_img image {
 .upload_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .item_list3 {
 .item_list3 {
-        padding: 39rpx 25rpx 40rpx 25rpx;
+    padding: 39rpx 25rpx 40rpx 25rpx;
 }
 }
 
 
 .package_title {
 .package_title {
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #222;
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #222;
 }
 }
 
 
 .package_box {
 .package_box {
-        display: flex;
-        margin-top: 44rpx;
+    display: flex;
+    margin-top: 44rpx;
 }
 }
 
 
 .package_img_box {
 .package_img_box {
-        width: 200rpx;
-        height: 200rpx;
+    width: 200rpx;
+    height: 200rpx;
 }
 }
 
 
 .package_img {
 .package_img {
-        width: 200rpx;
-        height: 200rpx;
+    width: 200rpx;
+    height: 200rpx;
 }
 }
 
 
 .package_img image {
 .package_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .package_content {
 .package_content {
-        font-size: 30rpx;
-        color: #222;
-        margin-left: 40rpx;
+    font-size: 30rpx;
+    color: #222;
+    margin-left: 40rpx;
 }
 }
 
 
 .package_hint {
 .package_hint {
-        font-size: 24rpx;
-        color: #94999a;
+    font-size: 24rpx;
+    color: #94999a;
 }
 }
 
 
 .pickage_display {
 .pickage_display {
-        font-size: 24rpx;
-        color: #f44;
-        margin-top: 47rpx;
+    font-size: 24rpx;
+    color: #f44;
+    margin-top: 47rpx;
 }
 }
 
 
 .item_list4 {
 .item_list4 {
-        padding: 46rpx 44rpx;
+    padding: 46rpx 44rpx;
 }
 }
 
 
 .detection_item {
 .detection_item {
-        display: flex;
-        justify-content: space-around;
-        margin-top: 58rpx;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 58rpx;
 }
 }
 
 
 .detection {
 .detection {
-        display: flex;
-        justify-content: center;
-        align-items: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 }
 
 
 .line1 {
 .line1 {
-        width: 115rpx;
-        height: 1rpx;
-        background: linear-gradient(to right, #fff, #bbb);
+    width: 115rpx;
+    height: 1rpx;
+    background: linear-gradient(to right, #fff, #bbb);
 }
 }
 
 
 .line2 {
 .line2 {
-        width: 115rpx;
-        height: 1rpx;
-        background: linear-gradient(to left, #fff, #bbb);
+    width: 115rpx;
+    height: 1rpx;
+    background: linear-gradient(to left, #fff, #bbb);
 }
 }
 
 
 .detection_title {
 .detection_title {
-        font-size: 26rpx;
-        color: #222;
-        margin: 0 30rpx;
+    font-size: 26rpx;
+    color: #222;
+    margin: 0 30rpx;
 }
 }
 
 
 .detection_box {
 .detection_box {
-        font-size: 26rpx;
-        color: #222;
+    font-size: 26rpx;
+    color: #222;
 }
 }
 
 
 .detection_img {
 .detection_img {
-        margin: 0 auto 23rpx;
-        width: 54rpx;
-        height: 54rpx;
+    margin: 0 auto 23rpx;
+    width: 54rpx;
+    height: 54rpx;
 }
 }
 
 
 .detection_img image {
 .detection_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .detection_hint {
 .detection_hint {
-        font-size: 22rpx;
-        color: #94999a;
-        text-align: center;
-        margin-top: 20rpx;
+    font-size: 22rpx;
+    color: #94999a;
+    text-align: center;
+    margin-top: 20rpx;
 }
 }
 
 
 .itme_list5 {
 .itme_list5 {
-        position: relative;
-        padding: 45rpx 25rpx 30rpx 25rpx;
-        box-sizing: border-box;
+    position: relative;
+    padding: 45rpx 25rpx 30rpx 25rpx;
+    box-sizing: border-box;
 }
 }
 
 
 .recommended_box {
 .recommended_box {
-        width: 150rpx;
-        height: 45rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background: #ffda44;
-        border-radius: 0 0 16rpx 16rpx;
-        font-size: 22rpx;
-        color: #333;
-        position: absolute;
-        right: 24rpx;
-        top: 0;
+    width: 150rpx;
+    height: 45rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #ffda44;
+    border-radius: 0 0 16rpx 16rpx;
+    font-size: 22rpx;
+    color: #333;
+    position: absolute;
+    right: 24rpx;
+    top: 0;
 }
 }
 
 
 .foretaste_box {
 .foretaste_box {
-        display: flex;
-        align-items: center;
-        font-size: 30rpx;
+    display: flex;
+    align-items: center;
+    font-size: 30rpx;
 }
 }
 
 
 .buyer_recommend {
 .buyer_recommend {
-        font-size: 22rpx;
-        color: #94999a;
-        margin-left: 20rpx;
+    font-size: 22rpx;
+    color: #94999a;
+    margin-left: 20rpx;
 }
 }
 
 
 .buyer_name {
 .buyer_name {
-        font-size: 30rpx;
-        color: #222;
+    font-size: 30rpx;
+    color: #222;
 }
 }
 
 
 .recommend_content {
 .recommend_content {
-        background-color: #fafafa;
-        border-radius: 16rpx;
-        padding: 25rpx 25rpx 25rpx 25rpx;
-        margin-top: 30rpx;
-        font-size: 26rpx;
-        color: #222;
-        position: relative;
+    background-color: #fafafa;
+    border-radius: 16rpx;
+    padding: 25rpx 25rpx 25rpx 25rpx;
+    margin-top: 30rpx;
+    font-size: 26rpx;
+    color: #222;
+    position: relative;
 }
 }
 
 
 .icon-shangyinhao {
 .icon-shangyinhao {
-        font-size: 22rpx;
-        color: #e3e3e3;
+    font-size: 22rpx;
+    color: #e3e3e3;
 }
 }
 
 
 .triangle {
 .triangle {
-        width: 0;
-        height: 0;
-        border-left: 60rpx solid #fafafa;
-        border-top: 30rpx solid transparent;
-        border-bottom: 30rpx solid transparent;
-        position: absolute;
-        top: -30rpx;
-        left: 50rpx;
+    width: 0;
+    height: 0;
+    border-left: 60rpx solid #fafafa;
+    border-top: 30rpx solid transparent;
+    border-bottom: 30rpx solid transparent;
+    position: absolute;
+    top: -30rpx;
+    left: 50rpx;
 }
 }
 
 
 .recommend_character {
 .recommend_character {
-        margin-left: 10rpx;
+    margin-left: 10rpx;
 }
 }
 
 
 .ingredients {
 .ingredients {
-        margin-top: 40rpx;
+    margin-top: 40rpx;
 }
 }
 
 
 .ingredients_title {
 .ingredients_title {
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #222;
-        text-align: center;
-        margin-bottom: 41rpx;
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #222;
+    text-align: center;
+    margin-bottom: 41rpx;
 }
 }
 
 
 .ingredients_img {
 .ingredients_img {
-        width: 280rpx;
-        height: 280rpx;
-        margin-right: 34rpx;
+    width: 280rpx;
+    height: 280rpx;
+    margin-right: 34rpx;
 }
 }
 
 
 .ingredients_box {
 .ingredients_box {
-        display: flex;
+    display: flex;
 }
 }
 
 
 .ingredients_img image {
 .ingredients_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .ingredients_item {
 .ingredients_item {
-        width: 400rpx;
-        font-size: 26rpx;
-        display: flex;
-        /* margin-left: 34rpx; */
-        margin-top: 34rpx;
-        /* border: 1px solid red; */
+    width: 400rpx;
+    font-size: 26rpx;
+    display: flex;
+    /* margin-left: 34rpx; */
+    margin-top: 34rpx;
+    /* border: 1px solid red; */
 }
 }
 
 
 .ingredients_name {
 .ingredients_name {
-        color: #94999a;
-        width: 80rpx;
+    color: #94999a;
+    width: 80rpx;
 }
 }
 
 
 .ingredients_content {
 .ingredients_content {
-        width: 300rpx;
-        display: flex;
-        flex-wrap: wrap;
-        margin-left: 30rpx;
+    width: 300rpx;
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 30rpx;
 }
 }
 
 
 .graphic_ingredients_box {
 .graphic_ingredients_box {
-        margin-top: 40rpx;
+    margin-top: 40rpx;
 }
 }
 
 
 .graphic_ingredients {
 .graphic_ingredients {
-        height: 200rpx;
-        border: 1rpx solid red;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-image: url('http://hifresh.w.bronet.cn/assets/wxapp/keshihua@2x.png');
-        margin-bottom: 20rpx;
+    height: 200rpx;
+    border: 1rpx solid red;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-image: url('http://hifresh.w.bronet.cn/assets/wxapp/keshihua@2x.png');
+    margin-bottom: 20rpx;
 }
 }
 
 
 .graphic_ingredients_background {
 .graphic_ingredients_background {
-        width: 450rpx;
-        height: 110rpx;
-        background-color: #ffb244;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+    width: 450rpx;
+    height: 110rpx;
+    background-color: #ffb244;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 }
 
 
 .graphic_ingredients_border {
 .graphic_ingredients_border {
-        font-size: 38rpx;
-        color: #fff;
-        width: 430rpx;
-        height: 90rpx;
-        border: 1rpx solid #fff;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+    font-size: 38rpx;
+    color: #fff;
+    width: 430rpx;
+    height: 90rpx;
+    border: 1rpx solid #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 }
 
 
 .item_list6 {
 .item_list6 {
-        padding: 30rpx 25rpx;
-        margin-bottom: 120rpx;
+    padding: 30rpx 25rpx;
+    margin-bottom: 120rpx;
 }
 }
-.item_list10{
-        padding: 30rpx 25rpx;
-        box-sizing: border-box
+
+.item_list10 {
+    padding: 30rpx 25rpx;
+    box-sizing: border-box;
 }
 }
 
 
 .collocation_title {
 .collocation_title {
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #222;
-        margin-bottom: 40rpx;
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #222;
+    margin-bottom: 40rpx;
 }
 }
 
 
 .collocation {
 .collocation {
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
 }
 }
 
 
 .collocation_box {
 .collocation_box {
-        width: 340rpx;
-        border-radius: 16rpx;
-        overflow: hidden;
-        margin-bottom:20rpx;
+    width: 340rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin-bottom: 20rpx;
 }
 }
 
 
 .collocation_img {
 .collocation_img {
-        width: 340rpx;
-        height: 340rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
 }
 
 
 .collocation_img image {
 .collocation_img image {
-        width: 100%;
-        height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .collocation_content {
 .collocation_content {
-        background: #fafafa;
-        font-size: 30rpx;
-        color: #222;
-        padding: 22rpx;
-        height: 152rpx;
-        position: relative
+    background: #fafafa;
+    font-size: 30rpx;
+    color: #222;
+    padding: 22rpx;
+    height: 152rpx;
+    position: relative;
 }
 }
 
 
 .bottom_btn {
 .bottom_btn {
-        width: 100%;
-        height: 100rpx;
-        background: #fff;
-        display: flex;
-        justify-content: flex-end;
-        align-items: center;
-        position: fixed;
-        bottom: 0;
-        left: 0;
+    width: 100%;
+    height: 100rpx;
+    background: #fff;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
 }
 }
 
 
 .hint_btn {
 .hint_btn {
-        width: 118rpx;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
+    width: 118rpx;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
 }
 }
 
 
 .icon-shoucang.active {
 .icon-shoucang.active {
-        color: #ff6700;
+    color: #ff6700;
 }
 }
 
 
 .shop_car {
 .shop_car {
-        font-size: 18rpx;
-        color: #747b7d;
-        position: relative;
+    font-size: 18rpx;
+    color: #747b7d;
+    position: relative;
 }
 }
 
 
 .cart_count {
 .cart_count {
-        position: absolute;
-        right: 2rpx;
-        top: 0;
-        width: 24rpx;
-        height: 24rpx;
-        border-radius: 50%;
-        background: red;
-        text-align: center;
-        line-height: 24rpx;
-        color: #fff;
-        font-size: 18rpx;
+    position: absolute;
+    right: 2rpx;
+    top: 0;
+    width: 24rpx;
+    height: 24rpx;
+    border-radius: 50%;
+    background: red;
+    text-align: center;
+    line-height: 24rpx;
+    color: #fff;
+    font-size: 18rpx;
 }
 }
 
 
 .shop_car.active {
 .shop_car.active {
-        color: #ff6700;
+    color: #ff6700;
 }
 }
 
 
 .join_btn {
 .join_btn {
-        width: 266rpx;
-        height: 100rpx;
-        background: linear-gradient(to left, #ffda44, #ffb244);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 26rpx;
-        color: #fff;
-}
-.join_btns{
-        width: 266rpx;
-        height: 100rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 26rpx;
-        color: #fff;
-        background: transparent
+    width: 266rpx;
+    height: 100rpx;
+    background: linear-gradient(to left, #ffda44, #ffb244);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26rpx;
+    color: #fff;
+}
+
+.join_btns {
+    width: 266rpx;
+    height: 100rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26rpx;
+    color: #fff;
+    background: transparent;
 }
 }
 
 
 .immediately_btn {
 .immediately_btn {
-        width: 632rpx;
-        height: 100rpx;
-        background: linear-gradient(to left, #f99115, #f56800);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 26rpx;
-        color: #fff;
+    width: 632rpx;
+    height: 100rpx;
+    background: linear-gradient(to left, #f99115, #f56800);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26rpx;
+    color: #fff;
 }
 }
 
 
 /*购物车添加状态*/
 /*购物车添加状态*/
 
 
 .cart_mask {
 .cart_mask {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: rgba(0, 0, 0, 0.8);
-        z-index: 9999999;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.8);
+    z-index: 9999999;
 }
 }
 
 
 .cart_mask_diceng {
 .cart_mask_diceng {
-        width: 80%;
-        /* min-height: 550rpx; */
-        position: absolute;
-        top: 50%;
-        margin-left: 10%;
-        transform: translateY(-50%);
-        background: rgba(255, 255, 255, 1);
-        border-radius: 10px;
-        padding-top: 20rpx;
-        padding-bottom: 130rpx;
+    width: 80%;
+    /* min-height: 550rpx; */
+    position: absolute;
+    top: 50%;
+    margin-left: 10%;
+    transform: translateY(-50%);
+    background: rgba(255, 255, 255, 1);
+    border-radius: 10px;
+    padding-top: 20rpx;
+    padding-bottom: 130rpx;
 }
 }
 
 
 .goods_name {
 .goods_name {
-        font-size: 30rpx;
-        font-family: PingFang-SC-Bold;
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 36rpx;
-        text-align: center;
-        margin-top: 30rpx;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Bold;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    line-height: 36rpx;
+    text-align: center;
+    margin-top: 30rpx;
 }
 }
 
 
 .weight {
 .weight {
-        height: 100rpx;
-        margin-top: 34rpx;
-        /* margin-bottom:44rpx; */
-        padding: 0 47rpx 0 36rpx;
-        box-sizing: border-box;
+    height: 100rpx;
+    margin-top: 34rpx;
+    /* margin-bottom:44rpx; */
+    padding: 0 47rpx 0 36rpx;
+    box-sizing: border-box;
 }
 }
 
 
 .weight_view {
 .weight_view {
-        font-size: 26rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(51, 51, 51, 1);
-        line-height: 36rpx;
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+    line-height: 36rpx;
 }
 }
 
 
 .quality {
 .quality {
-        margin-top: 24rpx;
+    margin-top: 24rpx;
 }
 }
 
 
 .quality_left {
 .quality_left {
-        width: 150rpx;
-        height: 50rpx;
-        margin-bottom: 20rpx;
-        background: rgba(247, 247, 247, 1);
-        border-radius: 10rpx;
-        text-align: center;
-        line-height: 50rpx;
-        font-size: 26rpx;
-        font-family: FZY3JW--GB1-0;
-        font-weight: 400;
-        color: rgba(26, 26, 26, 1);
-        float: left;
-        margin-right: 20rpx;
+    width: 150rpx;
+    height: 50rpx;
+    margin-bottom: 20rpx;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 10rpx;
+    text-align: center;
+    line-height: 50rpx;
+    font-size: 26rpx;
+    font-family: FZY3JW--GB1-0;
+    font-weight: 400;
+    color: rgba(26, 26, 26, 1);
+    float: left;
+    margin-right: 20rpx;
 }
 }
 
 
 .quality_left.active {
 .quality_left.active {
-        background: rgba(255, 218, 68, 1);
+    background: rgba(255, 218, 68, 1);
 }
 }
 
 
 .last_box {
 .last_box {
-        width: 100%;
-        height: 110rpx;
-        background: rgba(247, 247, 247, 1);
-        border-radius: 0px 0px 10px 10px;
-        margin-top: 100rpx;
-        /* padding: 18rpx 0 0 51rpx; */
-        box-sizing: border-box;
-        position: absolute;
-        bottom: 0;
+    width: 100%;
+    height: 110rpx;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 0px 0px 10px 10px;
+    margin-top: 100rpx;
+    /* padding: 18rpx 0 0 51rpx; */
+    box-sizing: border-box;
+    position: absolute;
+    bottom: 0;
 }
 }
 
 
 .last_box_top {
 .last_box_top {
-        font-size: 26rpx;
+    font-size: 26rpx;
 }
 }
 
 
 .last_box_top_price {
 .last_box_top_price {
-        display: flex;
-        color: #f44;
-        line-height: 78rpx;
-        font-family: PingFang-SC-Bold;
-        font-weight: bold;
+    display: flex;
+    color: #f44;
+    line-height: 78rpx;
+    font-family: PingFang-SC-Bold;
+    font-weight: bold;
 }
 }
 
 
 .last_box_top_price text {
 .last_box_top_price text {
-        color: #333;
-        font-size: 18rpx;
-        margin-left: 10rpx;
+    color: #333;
+    font-size: 18rpx;
+    margin-left: 10rpx;
 }
 }
 
 
 .member {
 .member {
-        text-align: center;
-        font-family: PingFang-SC-Medium;
-        margin-left: 24rpx;
-        background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));
-        border-radius: 5px;
-        color: rgba(187, 138, 54, 1);
-        padding: 4rpx -2rpx;
-        box-sizing: border-box;
-        /* margin-top:8rpx; */
-        font-size: 18rpx;
-        font-weight: 400;
+    text-align: center;
+    font-family: PingFang-SC-Medium;
+    margin-left: 24rpx;
+    background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));
+    border-radius: 5px;
+    color: rgba(187, 138, 54, 1);
+    padding: 4rpx -2rpx;
+    box-sizing: border-box;
+    /* margin-top:8rpx; */
+    font-size: 18rpx;
+    font-weight: 400;
 }
 }
 
 
 .purchase {
 .purchase {
-        width: 160rpx;
-        height: 50rpx;
-        background: rgba(255, 218, 68, 1);
-        border-radius: 25rpx;
-        font-size: 24rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(26, 26, 26, 1);
-        line-height: 50rpx;
-        text-align: center;
-        position: absolute;
-        right: 36rpx;
-        top: 30rpx;
+    width: 160rpx;
+    height: 50rpx;
+    background: rgba(255, 218, 68, 1);
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(26, 26, 26, 1);
+    line-height: 50rpx;
+    text-align: center;
+    position: absolute;
+    right: 36rpx;
+    top: 30rpx;
 }
 }
 
 
 .jiajian {
 .jiajian {
-        width: 120rpx;
-        height: 50rpx;
-        position: absolute;
-        right: 200rpx;
-        top: 40rpx;
-        display: flex;
-        justify-content: space-between;
+    width: 120rpx;
+    height: 50rpx;
+    position: absolute;
+    right: 200rpx;
+    top: 40rpx;
+    display: flex;
+    justify-content: space-between;
 }
 }
 
 
 .dec_num {
 .dec_num {
-        width: 32rpx;
-        height: 32rpx;
-        border-radius: 50%;
-        background: #ffda44;
-        font-size: 32rpx;
-        color: #fff;
-        font-weight: bold;
-        text-align: center;
-        line-height: 32rpx;
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    background: #ffda44;
+    font-size: 32rpx;
+    color: #fff;
+    font-weight: bold;
+    text-align: center;
+    line-height: 32rpx;
 }
 }
 
 
 .numnum {
 .numnum {
-        width: 32rpx;
-        height: 32rpx;
-        text-align: center;
-        line-height: 32rpx;
-        font-size: 30rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(102, 102, 102, 1);
+    width: 32rpx;
+    height: 32rpx;
+    text-align: center;
+    line-height: 32rpx;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(102, 102, 102, 1);
 }
 }
 
 
 .close_jump_cart {
 .close_jump_cart {
-        position: absolute;
-        top: 24rpx;
-        right: 24rpx;
-        color: #ededed;
-        font-size: 36rpx;
+    position: absolute;
+    top: 24rpx;
+    right: 24rpx;
+    color: #ededed;
+    font-size: 36rpx;
 }
 }
+
 /*团购样式*/
 /*团购样式*/
-.banner_box_group{
-        width:700rpx;
-        height:45rpx;
-        position: absolute;
-        left: 0;
-        bottom: 0;
-       background: linear-gradient(to right,#ffda44,transparent);
-       padding-left:26rpx;
-       z-index: 999;
-       font-size:26rpx;
-font-family:PingFang-SC-Medium;
-font-weight:500;
-color:rgba(255,255,255,1);
-line-height:45rpx;
+
+.banner_box_group {
+    width: 700rpx;
+    height: 45rpx;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    background: linear-gradient(to right, #ffda44, transparent);
+    padding-left: 26rpx;
+    z-index: 999;
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(255, 255, 255, 1);
+    line-height: 45rpx;
 }
 }
+
 /*团购*/
 /*团购*/
-.good_price_progress{
-        margin-top:10rpx;
-        }
-.group_font{
-        font-size:24rpx;
-font-family:PingFang-SC-Medium;
-font-weight:500;
-color:rgba(136,136,136,1);
-line-height:24rpx;
-height: 24rpx;
-
-}
-.goods_margin_top{
-        margin-top:20rpx;
-}
-.group_image{
-        border-radius: 16rpx;
-        overflow: hidden
-}
-.group_time{
-        position: absolute;
-        bottom:0;
-        height:30px;
-        width:200rpx;
-         background:rgba(187,187,187,1);
-        border-radius: 0 0 16rpx 16rpx;
-        padding:0 10rpx;
-        font-size:20rpx;
-font-family:PingFang-SC-Medium;
-font-weight:500;
-color:rgba(255,255,255,1);
-line-height:54rpx;
-text-align: center;
-}
-.group_time.active{
-        background:rgba(255,68,68,1);
-        }
+
+.good_price_progress {
+    margin-top: 10rpx;
+}
+
+.group_font {
+    font-size: 24rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(136, 136, 136, 1);
+    line-height: 24rpx;
+    height: 24rpx;
+}
+
+.goods_margin_top {
+    margin-top: 20rpx;
+}
+
+.group_image {
+    border-radius: 16rpx;
+    overflow: hidden;
+}
+
+.group_time {
+    position: absolute;
+    bottom: 0;
+    height: 30px;
+    width: 200rpx;
+    background: rgba(187, 187, 187, 1);
+    border-radius: 0 0 16rpx 16rpx;
+    padding: 0 10rpx;
+    font-size: 20rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(255, 255, 255, 1);
+    line-height: 54rpx;
+    text-align: center;
+}
+
+.group_time.active {
+    background: rgba(255, 68, 68, 1);
+}
 
 
 /*小贴士*/
 /*小贴士*/
 
 
-.explain{
-        width: 93.6%;
-        height:auto;
-        box-shadow:0px 15px 30px 0px rgba(214,214,214,0.6);
-        border-radius:16px;     
-        background: #fff;
-        margin:20rpx auto 130rpx;
-        padding:18rpx 49rpx;
-        box-sizing: border-box
-}
-.explain_one{
-        text-align: center;
-        font-size:30rpx;
-        font-family:PingFang-SC-Heavy;
-        font-weight:800;
-        color:rgba(38,54,58,1);
-        line-height:62rpx;
-        position: relative;     
-        margin-bottom:16rpx;
-}
-.explain_one::before{
-        width: 115rpx;
-        height: 1rpx;
-        position: absolute;
-        left:70rpx;
-        top:0;
-        bottom:0;
-        margin:auto 0;
-        content: '';
-        background: linear-gradient(to left,rgba(187,187,187,1),transparent);
-}
-.explain_one::after{
-        width: 115rpx;
-        height: 1rpx;
-        position: absolute;
-        right:70rpx;
-        top:0;
-        bottom:0;
-        margin:auto 0;
-        content: '';
-       background: linear-gradient(to right,rgba(187,187,187,1),transparent);
-}
-.explain_two{
-        font-size:26rpx;
-        font-family:PingFang-SC-Medium;
-        font-weight:500;
-        color:rgba(38,54,58,1);
-        line-height: 40rpx;
-}
-.food_title_all{
-        margin-bottom:30rpx;
-}
-.two_title_xixi{
-        width: 100%;
-        height: 23rpx;
-        text-align: center;
-        font-size:22rpx;
-font-family:PingFang-SC-Medium;
-font-weight:500;
-color:rgba(148,153,154,1);
-line-height:23rpx;
+.explain {
+    width: 93.6%;
+    height: auto;
+    box-shadow: 0px 15px 30px 0px rgba(214, 214, 214, 0.6);
+    border-radius: 16px;
+    background: #fff;
+    margin: 20rpx auto 130rpx;
+    padding: 18rpx 49rpx;
+    box-sizing: border-box;
+}
+
+.explain_one {
+    text-align: center;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Heavy;
+    font-weight: 800;
+    color: rgba(38, 54, 58, 1);
+    line-height: 62rpx;
+    position: relative;
+    margin-bottom: 16rpx;
+}
+
+.explain_one::before {
+    width: 115rpx;
+    height: 1rpx;
+    position: absolute;
+    left: 70rpx;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+    content: '';
+    background: linear-gradient(to left, rgba(187, 187, 187, 1), transparent);
+}
+
+.explain_one::after {
+    width: 115rpx;
+    height: 1rpx;
+    position: absolute;
+    right: 70rpx;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+    content: '';
+    background: linear-gradient(to right, rgba(187, 187, 187, 1), transparent);
+}
+
+.explain_two {
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(38, 54, 58, 1);
+    line-height: 40rpx;
+}
+
+.food_title_all {
+    margin-bottom: 30rpx;
+}
+
+.two_title_xixi {
+    width: 100%;
+    height: 23rpx;
+    text-align: center;
+    font-size: 22rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(148, 153, 154, 1);
+    line-height: 23rpx;
 }
 }
 
 
 .collocation_contents {
 .collocation_contents {
-  background: #fafafa;
-  font-size: 30rpx;
-  color: #222;
-  padding: 22rpx;
-}
-.overflowe{
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        position: relative
-}
-.icon-icondayu{
-        position: absolute;
-        right: 0;
-        top: 50%;
-        transform: translateY(-50%);
+    background: #fafafa;
+    font-size: 30rpx;
+    color: #222;
+    padding: 22rpx;
 }
 }
+
+.overflowe {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    position: relative;
+}
+
+.icon-icondayu {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
 .introduces {
 .introduces {
-  font-size: 28rpx;
-  color: #888;
+    font-size: 28rpx;
+    color: #888;
 }
 }
+
 .collocation_boxs {
 .collocation_boxs {
-  width: 360rpx;
-  border-radius: 16rpx;
-  overflow: hidden;
-  float: left;
-  padding:0 10rpx;
-  position: relative
-}
-.icon-weixuanzhong{
-        position: absolute;
-        right:20rpx;
-        top:15rpx;
-        color:#888;
-}
-.icon-weixuanzhong.active{
-        color:rgba(255,218,68,1);
-}
-.replace_dishes{
-        width: 100%;
-        /* width:699px; */
-height:80rpx;
-border:1rpx solid rgba(255,68,68,1);
-border-radius:40rpx;
-margin:10rpx 0 20rpx;
-display: flex;
-justify-content: center;
-align-items: center
-}
-.replace_dishes_center{
-        display: flex;
-        /* align-items: center */
-}
-.replace_image{
-        width: 31rpx;
-        height: 29rpx;
-        margin-right:18rpx;
-        margin-top:-14rpx;
-}
-.replace_image image{
-        width: 100%;
-        height: 100%
-}
-.replace_font{
-        height: 29rpx;
-        font-size:26rpx;
-font-family:PingFang-SC-Medium;
-font-weight:500;
-color:rgba(255,68,68,1);
-line-height: 29rpx;
+    width: 360rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    float: left;
+    padding: 0 10rpx;
+    position: relative;
 }
 }
+
+.icon-weixuanzhong {
+    position: absolute;
+    right: 20rpx;
+    top: 15rpx;
+    color: #888;
+}
+
+.icon-weixuanzhong.active {
+    color: rgba(255, 218, 68, 1);
+}
+
+.xuanzhongda {
+    width:80rpx;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    right: 0rpx !important;
+    top: 0rpx !important;
+    color: #888;
+    font-size: 40rpx !important;
+}
+
+.replace_dishes {
+    width: 100%;
+    /* width:699px; */
+    height: 80rpx;
+    border: 1rpx solid rgba(255, 68, 68, 1);
+    border-radius: 40rpx;
+    margin: 10rpx 0 20rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.replace_dishes_center {
+    display: flex;
+    /* align-items: center */
+}
+
+.replace_image {
+    width: 31rpx;
+    height: 29rpx;
+    margin-right: 18rpx;
+    margin-top: -14rpx;
+}
+
+.replace_image image {
+    width: 100%;
+    height: 100%;
+}
+
+.replace_font {
+    height: 29rpx;
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(255, 68, 68, 1);
+    line-height: 29rpx;
+}
+
 /*更换菜品弹框*/
 /*更换菜品弹框*/
-.maskMore{
-        width: 100%;
-        min-height: 100%;
-        background: #f3f5f5;
-        position: absolute;
-        left: 0;
-        top: 0;
+
+.maskMore {
+    width: 100%;
+    min-height: 100%;
+    background: #f3f5f5;
+    position: absolute;
+    left: 0;
+    top: 0;
 }
 }
 
 
 .coupons {
 .coupons {
-  font-size: 30rpx;
-  color: #222;
-  display: flex;
-}
-.explaina{
-        width: 93.6%;
-        height:auto;
-        box-shadow:0px 15px 30px 0px rgba(214,214,214,0.6);
-        border-radius:16px;     
-        background: #fff;
-        margin:120rpx auto 40rpx;
-        padding:18rpx 49rpx 18rpx;
-        box-sizing: border-box
-}
-.explain_one{
-        text-align: center;
-        font-size:30rpx;
-        font-family:PingFang-SC-Heavy;
-        font-weight:800;
-        color:rgba(38,54,58,1);
-        line-height:62rpx;
-        position: relative;     
-        margin-bottom:16rpx;
-}
-.explain_one::before{
-        width: 115rpx;
-        height: 1rpx;
-        position: absolute;
-        left:70rpx;
-        top:0;
-        bottom:0;
-        margin:auto 0;
-        content: '';
-        background: linear-gradient(to left,rgba(187,187,187,1),transparent);
-}
-.explain_one::after{
-        width: 115rpx;
-        height: 1rpx;
-        position: absolute;
-        right:70rpx;
-        top:0;
-        bottom:0;
-        margin:auto 0;
-        content: '';
-       background: linear-gradient(to right,rgba(187,187,187,1),transparent);
-}
-.explain_two{
-        font-size:26rpx;
-        font-family:PingFang-SC-Medium;
-        font-weight:500;
-        color:rgba(38,54,58,1);
-        line-height: 40rpx;
-}
-.three{
-        width: 100%;
-        padding:0 15rpx;
- }
+    font-size: 30rpx;
+    color: #222;
+    display: flex;
+}
+
+.explaina {
+    width: 93.6%;
+    height: auto;
+    box-shadow: 0px 15px 30px 0px rgba(214, 214, 214, 0.6);
+    border-radius: 16px;
+    background: #fff;
+    margin: 120rpx auto 40rpx;
+    padding: 18rpx 49rpx 18rpx;
+    box-sizing: border-box;
+}
+
+.explain_one {
+    text-align: center;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Heavy;
+    font-weight: 800;
+    color: rgba(38, 54, 58, 1);
+    line-height: 62rpx;
+    position: relative;
+    margin-bottom: 16rpx;
+}
+
+.explain_one::before {
+    width: 115rpx;
+    height: 1rpx;
+    position: absolute;
+    left: 70rpx;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+    content: '';
+    background: linear-gradient(to left, rgba(187, 187, 187, 1), transparent);
+}
+
+.explain_one::after {
+    width: 115rpx;
+    height: 1rpx;
+    position: absolute;
+    right: 70rpx;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+    content: '';
+    background: linear-gradient(to right, rgba(187, 187, 187, 1), transparent);
+}
+
+.explain_two {
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(38, 54, 58, 1);
+    line-height: 40rpx;
+}
+
+.three {
+    width: 100%;
+    padding: 0 15rpx;
+}
+
 .collocation_boxa {
 .collocation_boxa {
-  width: 360rpx;
-  border-radius: 16rpx;
-  overflow: hidden;
-  float: left;
-  padding:0 10rpx;
-  position: relative
+    width: 360rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    float: left;
+    padding: 0 10rpx;
+    position: relative;
 }
 }
 
 
 .collocation_img {
 .collocation_img {
-  width: 340rpx;
-  height: 340rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
 }
 
 
 .collocation_img image {
 .collocation_img image {
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
 }
 
 
 .introducea {
 .introducea {
-  font-size: 28rpx;
-  color: #888;
+    font-size: 28rpx;
+    color: #888;
 }
 }
 
 
-.icon-weixuanzhong{
-        position: absolute;
-        right:20rpx;
-        top:15rpx;
-        color:#888;
+.icon-weixuanzhong {
+    position: absolute;
+    right: 20rpx;
+    top: 15rpx;
+    color: #888;
 }
 }
-.icon-weixuanzhong.active{
-        color:rgba(255,218,68,1);
+
+.icon-weixuanzhong.active {
+    color: rgba(255, 218, 68, 1);
 }
 }
+
 /*购物车添加状态*/
 /*购物车添加状态*/
 
 
 .cart_mask {
 .cart_mask {
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: rgba(0, 0, 0, 0.8);
-        z-index: 9999999;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.8);
+    z-index: 9999999;
 }
 }
 
 
 .cart_mask_diceng {
 .cart_mask_diceng {
-        width: 80%;
-        /* min-height: 550rpx; */
-        position: absolute;
-        top: 50%;
-        margin-left: 10%;
-        transform: translateY(-50%);
-        background: rgba(255, 255, 255, 1);
-        border-radius: 10px;
-        padding-top: 20rpx;
-        padding-bottom: 130rpx;
+    width: 80%;
+    /* min-height: 550rpx; */
+    position: absolute;
+    top: 50%;
+    margin-left: 10%;
+    transform: translateY(-50%);
+    background: rgba(255, 255, 255, 1);
+    border-radius: 10px;
+    padding-top: 20rpx;
+    padding-bottom: 130rpx;
 }
 }
 
 
 .goods_name {
 .goods_name {
-        font-size: 30rpx;
-        font-family: PingFang-SC-Bold;
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 36rpx;
-        text-align: center;
-        margin-top: 30rpx;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Bold;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    line-height: 36rpx;
+    text-align: center;
+    margin-top: 30rpx;
 }
 }
 
 
 .weight {
 .weight {
-        height: 100rpx;
-        margin-top: 34rpx;
-        /* margin-bottom:44rpx; */
-        padding: 0 47rpx 0 36rpx;
-        box-sizing: border-box;
+    height: 100rpx;
+    margin-top: 34rpx;
+    /* margin-bottom:44rpx; */
+    padding: 0 47rpx 0 36rpx;
+    box-sizing: border-box;
 }
 }
 
 
 .weight_view {
 .weight_view {
-        font-size: 26rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(51, 51, 51, 1);
-        line-height: 36rpx;
+    font-size: 26rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+    line-height: 36rpx;
 }
 }
 
 
 .quality {
 .quality {
-        margin-top: 24rpx;
+    margin-top: 24rpx;
 }
 }
 
 
 .quality_left {
 .quality_left {
-        width: 150rpx;
-        height: 50rpx;
-        margin-bottom: 20rpx;
-        background: rgba(247, 247, 247, 1);
-        border-radius: 10rpx;
-        text-align: center;
-        line-height: 50rpx;
-        font-size: 26rpx;
-        font-family: FZY3JW--GB1-0;
-        font-weight: 400;
-        color: rgba(26, 26, 26, 1);
-        float: left;
-        margin-right: 20rpx;
+    width: 150rpx;
+    height: 50rpx;
+    margin-bottom: 20rpx;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 10rpx;
+    text-align: center;
+    line-height: 50rpx;
+    font-size: 26rpx;
+    font-family: FZY3JW--GB1-0;
+    font-weight: 400;
+    color: rgba(26, 26, 26, 1);
+    float: left;
+    margin-right: 20rpx;
 }
 }
 
 
 .quality_left.active {
 .quality_left.active {
-        background: rgba(255, 218, 68, 1);
+    background: rgba(255, 218, 68, 1);
 }
 }
 
 
 .last_box {
 .last_box {
-        width: 100%;
-        height: 110rpx;
-        background: rgba(247, 247, 247, 1);
-        border-radius: 0px 0px 10px 10px;
-        margin-top: 100rpx;
-        padding: 18rpx 0 0 51rpx;
-        box-sizing: border-box;
-        position: absolute;
-        bottom: 0;
+    width: 100%;
+    height: 110rpx;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 0px 0px 10px 10px;
+    margin-top: 100rpx;
+    padding: 18rpx 0 0 51rpx;
+    box-sizing: border-box;
+    position: absolute;
+    bottom: 0;
 }
 }
 
 
 .last_box_top_price text {
 .last_box_top_price text {
-        color: #333;
-        font-size: 18rpx;
-        margin-left: 10rpx;
+    color: #333;
+    font-size: 18rpx;
+    margin-left: 10rpx;
 }
 }
 
 
 .member_price {
 .member_price {
-        /* color: rgba(187, 138, 54, 1); */
-        color: #26363a;
+    /* color: rgba(187, 138, 54, 1); */
+    color: #26363a;
 }
 }
 
 
 .member {
 .member {
-        text-align: center;
-        font-family: PingFang-SC-Medium;
-        margin-left: 24rpx;
-        background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));
-        border-radius: 5px;
-        color: rgba(187, 138, 54, 1);
-        padding: 4rpx -2rpx;
-        box-sizing: border-box;
-        /* margin-top:8rpx; */
-        font-size: 18rpx;
-        font-weight: 400;
+    text-align: center;
+    font-family: PingFang-SC-Medium;
+    margin-left: 24rpx;
+    background: linear-gradient(-90deg, rgba(244, 243, 200, 1), rgba(250, 216, 90, 1));
+    border-radius: 5px;
+    color: rgba(187, 138, 54, 1);
+    padding: 4rpx -2rpx;
+    box-sizing: border-box;
+    /* margin-top:8rpx; */
+    font-size: 18rpx;
+    font-weight: 400;
 }
 }
 
 
 .purchase {
 .purchase {
-        width: 160rpx;
-        height: 50rpx;
-        background: rgba(255, 218, 68, 1);
-        border-radius: 25rpx;
-        font-size: 24rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(26, 26, 26, 1);
-        line-height: 50rpx;
-        text-align: center;
-        position: absolute;
-        right: 36rpx;
-        top: 30rpx;
+    width: 160rpx;
+    height: 50rpx;
+    background: rgba(255, 218, 68, 1);
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(26, 26, 26, 1);
+    line-height: 50rpx;
+    text-align: center;
+    position: absolute;
+    right: 36rpx;
+    top: 30rpx;
 }
 }
 
 
 .jiajian {
 .jiajian {
-        width: 120rpx;
-        height: 50rpx;
-        position: absolute;
-        right: 200rpx;
-        top: 40rpx;
-        display: flex;
-        justify-content: space-between;
+    width: 120rpx;
+    height: 50rpx;
+    position: absolute;
+    right: 200rpx;
+    top: 40rpx;
+    display: flex;
+    justify-content: space-between;
 }
 }
 
 
 .dec_num {
 .dec_num {
-        width: 32rpx;
-        height: 32rpx;
-        border-radius: 50%;
-        background: #ffda44;
-        font-size: 32rpx;
-        color: #fff;
-        font-weight: bold;
-        text-align: center;
-        line-height: 32rpx;
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    background: #ffda44;
+    font-size: 32rpx;
+    color: #fff;
+    font-weight: bold;
+    text-align: center;
+    line-height: 32rpx;
 }
 }
 
 
 .numnum {
 .numnum {
-        width: 32rpx;
-        height: 32rpx;
-        text-align: center;
-        line-height: 32rpx;
-        font-size: 30rpx;
-        font-family: PingFang-SC-Medium;
-        font-weight: 500;
-        color: rgba(102, 102, 102, 1);
+    width: 32rpx;
+    height: 32rpx;
+    text-align: center;
+    line-height: 32rpx;
+    font-size: 30rpx;
+    font-family: PingFang-SC-Medium;
+    font-weight: 500;
+    color: rgba(102, 102, 102, 1);
 }
 }
 
 
 .close_jump_cart {
 .close_jump_cart {
-        position: absolute;
-        top: 24rpx;
-        right: 24rpx;
-        color: #ededed;
-        font-size: 36rpx;
+    position: absolute;
+    top: 24rpx;
+    right: 24rpx;
+    color: #ededed;
+    font-size: 36rpx;
 }
 }
+
 .pickage_display {
 .pickage_display {
-        font-size: 24rpx;
-        color: #f44;
-        margin-top: 47rpx;
+    font-size: 24rpx;
+    color: #f44;
+    margin-top: 47rpx;
 }
 }
+
 .money_icon2 {
 .money_icon2 {
-        font-size: 22rpx;
-        color: #f44;
+    font-size: 22rpx;
+    color: #f44;
 }
 }
 
 
 .money2 {
 .money2 {
-        font-size: 38rpx;
-        font-weight: bold;
-        color: #f44;
-}
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #f44;
+}

@@ -2,7 +2,7 @@
 const app = getApp();
 const app = getApp();
 const WxParse = require('../../../wxParse/wxParse/wxParse.js');
 const WxParse = require('../../../wxParse/wxParse/wxParse.js');
 Page({
 Page({
-
+ 
         /**
         /**
          * 页面的初始数据
          * 页面的初始数据
          */
          */
@@ -46,7 +46,9 @@ Page({
                 groupList: [],
                 groupList: [],
                 yesno: false,
                 yesno: false,
                 stock:0,
                 stock:0,
-                is_vip:0
+                is_vip:0,
+            string:'',
+            gggPrice: null
         },
         },
         //进入基本参数
         //进入基本参数
         jumpBasicInfo() {
         jumpBasicInfo() {
@@ -203,6 +205,8 @@ Page({
                 console.log(str)
                 console.log(str)
                 new_arr_item = new_arr_item.join(',');
                 new_arr_item = new_arr_item.join(',');
                 new_arr_item = new_arr_item.replace(/,/g, "    ");
                 new_arr_item = new_arr_item.replace(/,/g, "    ");
+                var string = ''
+                var gggPrice = null
                 for (let i in sys_attrprice) {
                 for (let i in sys_attrprice) {
                         if (i == str) {
                         if (i == str) {
                                 skuid = sys_attrprice[i].skuid
                                 skuid = sys_attrprice[i].skuid
@@ -210,8 +214,14 @@ Page({
                                 old_skuid_price = sys_attrprice[i].old_price
                                 old_skuid_price = sys_attrprice[i].old_price
                                 vip_skuid_price = sys_attrprice[i].vip_price
                                 vip_skuid_price = sys_attrprice[i].vip_price
                                 stock = sys_attrprice[i].stock
                                 stock = sys_attrprice[i].stock
+                                string = sys_attrprice[i].sku_values
                         }
                         }
                 }
                 }
+           if(that.data.is_vip==1){
+               gggPrice = vip_skuid_price
+           } else {
+               gggPrice = old_skuid_price
+           }
                 this.setData({
                 this.setData({
                         id_arr: new_arr,
                         id_arr: new_arr,
                         idss: new_arr,
                         idss: new_arr,
@@ -221,7 +231,9 @@ Page({
                         vip_skuid_price: vip_skuid_price,
                         vip_skuid_price: vip_skuid_price,
                         skuid_arr: new_arr,
                         skuid_arr: new_arr,
                         ids: new_arr_item,
                         ids: new_arr_item,
-                        stock:stock
+                        stock:stock,
+                        string: string,
+                    gggPrice: gggPrice
                 });
                 });
         },
         },
         //关闭弹窗
         //关闭弹窗
@@ -282,6 +294,7 @@ Page({
                 };
                 };
                 let that = this
                 let that = this
                 let stock=null
                 let stock=null
+                let string = null
                 app.post(url, params).then(r => {
                 app.post(url, params).then(r => {
                         console.log(r);
                         console.log(r);
                         WxParse.wxParse('content', 'html', r.data.info.content, this, 5);
                         WxParse.wxParse('content', 'html', r.data.info.content, this, 5);
@@ -316,8 +329,15 @@ Page({
                                         old_skuid_price = sys_attrprice[i].old_price
                                         old_skuid_price = sys_attrprice[i].old_price
                                         vip_skuid_price = sys_attrprice[i].vip_price
                                         vip_skuid_price = sys_attrprice[i].vip_price
                                         stock = sys_attrprice[i].stock
                                         stock = sys_attrprice[i].stock
+                                    string =sys_attrprice[i].sku_values
                                 }
                                 }
                         }
                         }
+                        var gggPrice = null
+                        if(that.data.is_vip==1){
+                            gggPrice = vip_skuid_price
+                        }else{
+                            gggPrice = old_skuid_price
+                        }
                         r.data.comment.forEach(function(ele, index) {
                         r.data.comment.forEach(function(ele, index) {
                                 that.setData({
                                 that.setData({
                                         goods_star: ele.goods_stars
                                         goods_star: ele.goods_stars
@@ -361,6 +381,7 @@ Page({
                                         percent: percent,
                                         percent: percent,
                                         goods: r.data,
                                         goods: r.data,
                                         gPrice: zuihoujiage,
                                         gPrice: zuihoujiage,
+                                        gggPrice: gggPrice,
                                         collocation: r.data.collocation,
                                         collocation: r.data.collocation,
                                         comment: r.data.comment,
                                         comment: r.data.comment,
                                         skuid: skuid,
                                         skuid: skuid,
@@ -368,14 +389,16 @@ Page({
                                         id_arr: arr,
                                         id_arr: arr,
                                         skuid_arr: arr,
                                         skuid_arr: arr,
                                         yesno: true,
                                         yesno: true,
-                                        stock: stock
+                                        stock: stock,
+                                        string: string
                                 });
                                 });
                         } else {
                         } else {
                                 console.log("不是团购")
                                 console.log("不是团购")
                                 that.setData({
                                 that.setData({
                                         yesno: false,
                                         yesno: false,
-                                        goods: r.data,
-                                        gPrice: zuihoujiage,
+                                    goods: r.data,
+                                    gPrice: zuihoujiage,
+                                    gggPrice: gggPrice,
                                         collocation: r.data.collocation,
                                         collocation: r.data.collocation,
                                         comment: r.data.comment,
                                         comment: r.data.comment,
                                         favorite: r.data.is_favorite,
                                         favorite: r.data.is_favorite,
@@ -385,7 +408,8 @@ Page({
                                         skuid: skuid,
                                         skuid: skuid,
                                         skuid_arr: arr,
                                         skuid_arr: arr,
                                         id_arr: arr,
                                         id_arr: arr,
-                                        stock: stock
+                                        stock: stock,
+                                        string: string
                                 });
                                 });
                         }
                         }
                 });
                 });

@@ -4,7 +4,7 @@
         <view class='detail_container {{show||shows||basicInfo?"active":""}}'>
         <view class='detail_container {{show||shows||basicInfo?"active":""}}'>
                 <view class='banner'>
                 <view class='banner'>
                         <view class='iconfont icon-fanhui' catchtap='get_back'></view>
                         <view class='iconfont icon-fanhui' catchtap='get_back'></view>
-                        <view class='coupons'> 
+                        <view class='coupons'>  
                                 <view class='goods_detail {{active?"active":""}}' bindtap='jump_goods' id='NAV{{one}}'>商品详情</view>
                                 <view class='goods_detail {{active?"active":""}}' bindtap='jump_goods' id='NAV{{one}}'>商品详情</view>
                                 <view class='graphic_detail {{!active?"active":""}}' bindtap='jump_detail' id='NAV{{two}}'>图文详情</view>
                                 <view class='graphic_detail {{!active?"active":""}}' bindtap='jump_detail' id='NAV{{two}}'>图文详情</view>
                         </view>
                         </view>
@@ -53,8 +53,8 @@
                                                                 <text class='original_price '>￥{{goods.info.old_price}}</text>
                                                                 <text class='original_price '>￥{{goods.info.old_price}}</text>
                                                         </view>
                                                         </view>
                                                         <view class='display_box '>
                                                         <view class='display_box '>
-                                                                <text class='money_icon2 '>￥</text>
-                                                                <text class='money2 '>{{goods.info.vip_price}}</text>
+                                                                <view class='money_icon2 '>￥</view>
+                                                                <view class='money2 '>{{goods.info.vip_price}}</view>
                                                                 <view class='vip '>
                                                                 <view class='vip '>
                                                                         <image class='vipvip ' src='{{imgUrl}}vipvip.png '></image>
                                                                         <image class='vipvip ' src='{{imgUrl}}vipvip.png '></image>
                                                                 </view>
                                                                 </view>
@@ -275,7 +275,7 @@
                                 </view>
                                 </view>
                                 
                                 
                                 <view class='templates'  id='NAV{{two}}'>
                                 <view class='templates'  id='NAV{{two}}'>
-                                        <template is="wxParse" data="{{wxParseData:content.nodes}}" />
+                                        <template class=''  is="wxParse" data="{{wxParseData:content.nodes}}" />
                                 </view>
                                 </view>
                         </view>
                         </view>
                 </scroll-view>
                 </scroll-view>
@@ -311,18 +311,27 @@
                                         <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
                                         <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
                                 </view>
                                 </view>
                         </view>
                         </view>
-
+                        <view class='goumaishuliang'>
+                                <view>购买数量</view>
+                                <text  decode="{{true}}" class='kucun'>&nbsp;（库存{{stock}}）</text>
+                                <view class='jiajianjian' wx:if='{{!goods.groupType}}'>
+                                                <view bindtap='dec_num' class='dec_num'>-</view>
+                                                <view class='numnum'> {{num}}</view>
+                                                <view bindtap='add_num' class='dec_num'>+</view>
+                                        </view>
+                        </view>
                         <view class='last_box'>
                         <view class='last_box'>
                                 <view class='last_box_top'>
                                 <view class='last_box_top'>
-                                        <view class='last_box_top_price'>
-                                                <view>￥{{skuid_price}}</view>
+                                        <view class=' last_box_top_price last_box_top_pricess'>
+                                                <view>￥{{gggPrice}}</view>
+                                                <text  decode="{{true}}">({{string}})</text>
                                         </view>
                                         </view>
                                 </view>
                                 </view>
                                 <view class='last_box_top'>
                                 <view class='last_box_top'>
-                                        <view class='last_box_top_price'>
+                                        <!-- <view class='last_box_top_price'>
                                                 <view class='member_price'>￥{{vip_skuid_price}}</view>
                                                 <view class='member_price'>￥{{vip_skuid_price}}</view>
                                                 <text class='member'>会员专享</text>
                                                 <text class='member'>会员专享</text>
-                                        </view> 
+                                        </view>  -->
                                         <!-- <view class='jiajian'>
                                         <!-- <view class='jiajian'>
                                                 <view bindtap='dec_num' class='dec_num'>-</view>
                                                 <view bindtap='dec_num' class='dec_num'>-</view>
                                                 <view class='numnum'> {{num}}</view>
                                                 <view class='numnum'> {{num}}</view>
@@ -344,9 +353,37 @@
                                         <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
                                         <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
                                 </view>
                                 </view>
                         </view>
                         </view>
-
+<view class='goumaishuliang'>
+                                <view>购买数量</view>
+                                <text  decode="{{true}}" class='kucun'>&nbsp;（库存{{stock}}）</text>
+                                <view class='jiajianjian' wx:if='{{!goods.groupType}}'>
+                                                <view bindtap='dec_num' class='dec_num'>-</view>
+                                                <view class='numnum'> {{num}}</view>
+                                                <view bindtap='add_num' class='dec_num'>+</view>
+                                        </view>
+                        </view>
                         <view class='last_box'>
                         <view class='last_box'>
                                 <view class='last_box_top'>
                                 <view class='last_box_top'>
+                                        <view class=' last_box_top_price last_box_top_pricess'>
+                                                <view>￥{{gggPrice}}</view>
+                                                <text  decode="{{true}}">({{string}})</text>
+                                        </view>
+                                </view>
+                                <view class='last_box_top'>
+                                        <!-- <view class='last_box_top_price'>
+                                                <view class='member_price'>￥{{vip_skuid_price}}</view>
+                                                <text class='member'>会员专享</text>
+                                        </view>  -->
+                                        <!-- <view class='jiajian'>
+                                                <view bindtap='dec_num' class='dec_num'>-</view>
+                                                <view class='numnum'> {{num}}</view>
+                                                <view bindtap='add_num' class='dec_num'>+</view>
+                                        </view> -->
+                                        <view class='purchase' data-limit='{{goods.info.limit_numer}}' bindtap='hide_masks'>确定</view>
+                                </view>
+                        </view>
+                        <!-- <view class='last_box'>
+                                <view class='last_box_top'>
                                         <view class='last_box_top_price'>
                                         <view class='last_box_top_price'>
                                                 <view>￥{{goods.info.price}}</view>
                                                 <view>￥{{goods.info.price}}</view>
                                         </view>
                                         </view>
@@ -363,7 +400,7 @@
                                         </view>
                                         </view>
                                         <view class='purchase' bindtap='hide_masks'>确定</view>
                                         <view class='purchase' bindtap='hide_masks'>确定</view>
                                 </view>
                                 </view>
-                        </view>
+                        </view> -->
                 </view>
                 </view>
         </view>
         </view>
         <!-- 基本信息弹框 -->
         <!-- 基本信息弹框 -->

@@ -5,9 +5,11 @@ page {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;
 }
 }
-
+text{
+    height: 0!important
+}
 .big_box {
 .big_box {
-        width: 100%;
+        width: 100%; 
         height: 100%;
         height: 100%;
 }
 }
 .shicai{
 .shicai{
@@ -130,10 +132,13 @@ page {
 }
 }
 
 
 .display_box {
 .display_box {
-        width: auto;
+    height: 30rpx;
         margin-left: 40rpx;
         margin-left: 40rpx;
         display: flex;
         display: flex;
-        align-items: center
+        align-items: center;
+        flex-wrap: nowrap;
+        white-space: nowrap;
+        line-height: 30rpx;
 }
 }
 
 
 .money_icon2 {
 .money_icon2 {
@@ -142,6 +147,8 @@ page {
 }
 }
 
 
 .money2 {
 .money2 {
+    height: 30rpx;
+    line-height: 30rpx;
         font-size: 38rpx;
         font-size: 38rpx;
         font-weight: bold;
         font-weight: bold;
         color: #f44;
         color: #f44;
@@ -298,6 +305,9 @@ white-space: nowrap;
         background-color: #fff;
         background-color: #fff;
         margin-bottom: 20rpx;
         margin-bottom: 20rpx;
 }
 }
+.item_list2{
+    margin-bottom: 0
+}
 
 
 .user_evaluation {
 .user_evaluation {
         display: flex;
         display: flex;
@@ -584,7 +594,7 @@ white-space: nowrap;
 }
 }
 
 
 .ingredients {
 .ingredients {
-        margin-top: 40rpx;
+        /* margin-top: 40rpx; */
 }
 }
 
 
 .ingredients_title {
 .ingredients_title {
@@ -676,7 +686,7 @@ white-space: nowrap;
 }
 }
 .templates{
 .templates{
         width: 100%!important;
         width: 100%!important;
-        margin: 20rpx auto 0!important;
+        margin: 30rpx auto 0!important;
 }
 }
 .wxParse-p{
 .wxParse-p{
         width: 100%;
         width: 100%;
@@ -684,7 +694,7 @@ white-space: nowrap;
 }
 }
 .wxParse-img{
 .wxParse-img{
         width: 100%!important;
         width: 100%!important;
-        margin: 0 auto!important
+        margin: -30rpx auto 0!important 
 }
 }
 .content_item{
 .content_item{
         margin-bottom:120rpx;
         margin-bottom:120rpx;
@@ -839,12 +849,23 @@ white-space: nowrap;
         background: rgba(255, 255, 255, 1);
         background: rgba(255, 255, 255, 1);
         border-radius: 10px;
         border-radius: 10px;
         padding-top: 20rpx;
         padding-top: 20rpx;
-        padding-bottom: 130rpx;
+        padding-bottom: 110rpx;
 }
 }
 .info_mask_diceng{
 .info_mask_diceng{
          padding-bottom: 0;
          padding-bottom: 0;
 }
 }
-
+.goumaishuliang{
+        height: 120rpx;
+        width: 100%;
+        margin-top: 50rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        position: relative
+}
+.kucun{
+        color: #a0a0a0
+}
 .goods_name {
 .goods_name {
         font-size: 30rpx;
         font-size: 30rpx;
         font-family: PingFang-SC-Bold;
         font-family: PingFang-SC-Bold;
@@ -906,7 +927,8 @@ white-space: nowrap;
         background: rgba(247, 247, 247, 1);
         background: rgba(247, 247, 247, 1);
         border-radius: 0px 0px 10px 10px;
         border-radius: 0px 0px 10px 10px;
         margin-top: 100rpx;
         margin-top: 100rpx;
-        padding: 18rpx 0 0 51rpx;
+        padding-left: 30rpx;
+        /* padding: 18rpx 0 0 51rpx; */
         box-sizing: border-box;
         box-sizing: border-box;
         position: absolute;
         position: absolute;
         bottom: 0;
         bottom: 0;
@@ -937,6 +959,14 @@ white-space: nowrap;
         font-family: PingFang-SC-Bold;
         font-family: PingFang-SC-Bold;
         font-weight: bold;
         font-weight: bold;
 }
 }
+.last_box_top_pricess{
+    font-size: 28rpx;
+    line-height: 110rpx;
+}
+.last_box_top_pricess text{
+    font-size: 28rpx!important;
+    color: #26363a
+}
 
 
 .last_box_top_price text {
 .last_box_top_price text {
         color: #333;
         color: #333;
@@ -977,7 +1007,16 @@ white-space: nowrap;
         right: 36rpx;
         right: 36rpx;
         top: 30rpx;
         top: 30rpx;
 }
 }
-
+.jiajianjian{
+    width: 120rpx;
+        height: 50rpx;
+        position: absolute;
+        right:20rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        display: flex;
+        justify-content: space-between;
+}
 .jiajian {
 .jiajian {
         width: 120rpx;
         width: 120rpx;
         height: 50rpx;
         height: 50rpx;

@@ -90,7 +90,8 @@ Page({
                 scrolltop:0,
                 scrolltop:0,
                 stock:-1,
                 stock:-1,
                 xiaban:{},
                 xiaban:{},
-          resolve:false
+          resolve:false,
+          aaa:true
         },
         },
         //获取购物车数量
         //获取购物车数量
         fetchCartNum() {
         fetchCartNum() {
@@ -859,8 +860,23 @@ Page({
                 if (e.scrollTop > 180) {
                 if (e.scrollTop > 180) {
                         that.setData({
                         that.setData({
                                 maodianFlag: true,
                                 maodianFlag: true,
-                                resolve:true
+                                aaa: false
                         }) 
                         }) 
+                    if(that.data.nav!=0){
+                            wx.pageScrollTo({
+                                scrollTop: 0,
+                                duration: 0
+                            })
+                        that.setData({
+                            resolve: true, 
+                            })
+                    }
+                        console.log('改了吗'+that.data.resolve)
+                } else {
+                    that.setData({
+                        resolve: false,
+                        aaa:true
+                    }) 
                 }
                 }
                 // if(that.data.nav!==0){
                 // if(that.data.nav!==0){
                 //         const query = wx.createSelectorQuery()
                 //         const query = wx.createSelectorQuery()

@@ -5,6 +5,12 @@
 }
 }
  .zuida{
  .zuida{
           background-color: #fafafa;
           background-color: #fafafa;
+          height: 100%;
+          overflow: hidden
+ }
+ .zuida.active{
+     height: 100%;
+     overflow: hidden
  }
  }
 page {
 page {
         /* background-color: #fafafa; */
         /* background-color: #fafafa; */
@@ -12,11 +18,11 @@ page {
         height: 100%;
         height: 100%;
 }
 }
 .big_page{
 .big_page{
-        min-height: 100%
+    width: 100%;
 }
 }
-.big_box.active{
-  height: 100%;
-  overflow: hidden
+.big_page.active{
+        height: 100%;
+        overflow: hidden
 }
 }
 .page {
 .page {
         width: 100%;
         width: 100%;
@@ -36,7 +42,7 @@ page {
 }
 }
 
 
 .big_box.active {
 .big_box.active {
-        height: 100%;
+       height: 100%;
         overflow: hidden;
         overflow: hidden;
 }
 }
 
 
@@ -385,7 +391,10 @@ page {
         border-radius: 16rpx;
         border-radius: 16rpx;
         overflow: hidden;
         overflow: hidden;
 }
 }
-
+.good_img image{
+    width: 100%;
+    height: 100%
+}
 .label_image {
 .label_image {
         width: 70rpx;
         width: 70rpx;
         height: 70rpx;
         height: 70rpx;
@@ -395,12 +404,14 @@ page {
 }
 }
 
 
 .goods_img_image {
 .goods_img_image {
-        width: 200rpx;
-        height: 200rpx;
+        width: 200rpx!important;
+        height: 200rpx!important;
         border-radius: 16rpx;
         border-radius: 16rpx;
         overflow: hidden
         overflow: hidden
 }
 }
-
+.good_right{
+    width: calc(100% - 220rpx)
+}
 .good_name {
 .good_name {
         height: 32rpx;
         height: 32rpx;
         line-height: 32rpx;
         line-height: 32rpx;
@@ -950,6 +961,10 @@ page {
 }
 }
 
 
 .goods_one_right_one {
 .goods_one_right_one {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
         font-size: 30rpx;
         font-size: 30rpx;
         font-family: PingFang-SC-Medium;
         font-family: PingFang-SC-Medium;
         font-weight: 500;
         font-weight: 500;
@@ -1993,4 +2008,7 @@ color:rgba(18,25,27,1);
         /* padding: 0 */
         /* padding: 0 */
         /* background: red; */
         /* background: red; */
         /* padding-top: 200rpx; */
         /* padding-top: 200rpx; */
+}
+.goods_one_right{
+    width: calc(100% - 180rpx)
 }
 }

 /* pages/index/select_source/select_source.wxss */
 /* pages/index/select_source/select_source.wxss */
 @import  "../../../wxParse/wxParse/wxParse.wxss";
 @import  "../../../wxParse/wxParse/wxParse.wxss";
+.wxParse-img{
+        width: 100%!important;
+        margin: -10rpx auto 0!important 
+}

@@ -11,4 +11,7 @@
          font-size: 28rpx;
          font-size: 28rpx;
         font-family: PingFang-SC-Medium;
         font-family: PingFang-SC-Medium;
         line-height: 40rpx
         line-height: 40rpx
+}
+.wxParse-img{
+        margin: -10rpx auto 0!important 
 }
 }

@@ -6,6 +6,9 @@
 view{
 view{
         width: 100%
         width: 100%
 }
 }
+.wxParse-img{
+        margin: -10rpx auto 0!important 
+}
 .wxparse{
 .wxparse{
         width: 100%
         width: 100%
 }
 }

@@ -390,6 +390,7 @@ after_order(e) {
 go_pay(e) {
 go_pay(e) {
         let index = e.currentTarget.dataset.index;
         let index = e.currentTarget.dataset.index;
         let orderList = this.data.orderList;
         let orderList = this.data.orderList;
+        let amount = e.currentTarget.dataset.amount
         let pay_type = orderList[index].pay_type;
         let pay_type = orderList[index].pay_type;
         let pay_order_sn = orderList[index].order_sn;
         let pay_order_sn = orderList[index].order_sn;
         console.log(pay_order_sn)
         console.log(pay_order_sn)
@@ -410,10 +411,13 @@ go_pay(e) {
                                         success(res) {
                                         success(res) {
                                                 console.log(456);
                                                 console.log(456);
                                                 console.log(res);
                                                 console.log(res);
+                                            wx.navigateTo({
+                                                url: '../paySuccess/paySuccess?order=' + pay_order_sn+'&amount='+amount,
+                                            })
                                         },
                                         },
                                         fail(res) {
                                         fail(res) {
                                                 console.log(789);
                                                 console.log(789);
-                                                console.log(res);
+                                                console.log(res);   
                                         }
                                         }
                                 })
                                 })
                         }
                         }

@@ -40,7 +40,7 @@
                                                 <view>
                                                 <view>
                                                         <view class='money_btn' wx:if='{{cell.status==1}}'>
                                                         <view class='money_btn' wx:if='{{cell.status==1}}'>
                                                                 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
                                                                 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
-                                                                <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-index='{{index}}'>付款</view>
+                                                                <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-amount='{{cell.amount}}' data-index='{{index}}'>付款</view>
                                                         </view>
                                                         </view>
                                                         <view class='money_btn' wx:elif='{{cell.status==2}}'>
                                                         <view class='money_btn' wx:elif='{{cell.status==2}}'>
                                                                 <view class='cancel' data-index='{{index}}' catchtap='alert_send_goods' data-ordersn='{{cell.order_sn}}'>提醒发货</view>
                                                                 <view class='cancel' data-index='{{index}}' catchtap='alert_send_goods' data-ordersn='{{cell.order_sn}}'>提醒发货</view>
@@ -96,7 +96,7 @@
                                                 </view>
                                                 </view>
                                                 <view class='money_btn'>
                                                 <view class='money_btn'>
                                                         <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
                                                         <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
-                                                        <view class='pay' catchtap='go_pay' data-index='{{index}}'>付款</view>
+                                                        <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-amount='{{cell.amount}}' data-index='{{index}}'>付款</view>
                                                 </view>
                                                 </view>
                                         </view>
                                         </view>
                                 </view>
                                 </view>

+// pages/my/paySuccess/paySuccess.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        order: null,
+        amount: null
+    },
+
+    //get_back
+    get_back(){
+        wx.switchTab({
+            url: '../my',
+        })
+    },
+    //返回首页
+    go_index(){
+      wx.switchTab({
+          url: '../../index/index',
+      })
+    },
+    //订单详情
+    go_order(){
+        wx.navigateTo({
+            url: '/pages/my/unship/unship?id='+this.data.order,
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+            this.setData({
+                order:options.order,
+                amount:options.amount
+            })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+        return {
+            path: '/pages/start/start?share_id=' + app.globalData.user_id,
+            imgUrl: '',
+            title: ''
+        }
+    }
+})

+{
+  "usingComponents": {}
+}

+<view class='page'>
+  <view class='banner'>
+                  <view class='iconfont icon-fanhui' catchtap='get_back'></view>
+                <view class='coupons'>支付成功</view>
+                  <view class='share'> 
+                                <button open-type='share' type='false' class='share_btn' plain='true'>
+                                        <image src='../../imgs/fenxinag.png'></image>
+                                </button>
+                    </view>
+        </view>
+        <view class='two'>
+                <view class='two_item'>
+                        <view class='duigoua'>
+                                <image src='../../imgs/duigoua.png'></image>
+                        </view>
+                        <view class='pay_success'>付款成功</view>
+                        <view class='price'>￥{{amount}}</view>
+                </view>
+                <view class='two_two' bindtap='go_order'>订单详情</view>
+                <view class='two_three' bindtap='go_index'>返回首页</view>
+        </view>
+</view>

+page {
+    width: 100%;
+    height: 100%;
+    background: #fafafa;
+}
+
+.page {
+    width: 100%;
+}
+.share{
+    height: 86rpx;
+    width: 36rpx;
+    padding: 26rpx 0;
+    box-sizing: border-box
+}
+.share_btn {
+    width: 36rpx!important;
+    height: 34rpx!important;
+        /* background: transparent; */
+        padding: 0;
+        margin: 0;
+        border: 0 !important;
+        color: #222;
+        z-index: 999;
+        display: flex;
+        justify-content: center;
+        align-items: center
+}
+.share_btn image{
+    width: 100%;
+    height: 100%
+}
+.two {
+    width: 100%;
+    height: 380rpx;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+    margin-top: 16rpx;
+}
+
+.two_item {
+    width: 100%;
+    height: 100%;
+    background: rgba(255, 255, 255, 1);
+    border: 1rpx solid rgba(237, 237, 237, 1);
+    border-radius: 16rpx;
+    padding: 57rpx 0 70rpx 0;
+    box-sizing: border-box;
+}
+
+.duigoua {
+    width: 126rpx;
+    height: 110rpx;
+    margin: 0 auto;
+}
+.duigoua image{
+    width: 100%;
+   height: 100%
+}
+
+.pay_success {
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #ffda44;
+    text-align: center;
+    margin-top: 19rpx;
+}
+
+.price {
+    height: 52rpx;
+    line-height: 52rpx;
+    margin-top: 41rpx;
+    font-size: 70rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    text-align: center;
+}
+
+.two_two, .two_three {
+    width: 100%;
+    height: 80rpx;
+    background: #ffda44;
+    box-shadow: 0rpx 15rpx 30rpx 0rpx rgba(255,218,68,0.6);
+    border-radius: 40rpx;
+    text-align: center;
+    line-height: 80rpx;
+    font-size: 26rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(255, 255, 255, 1);
+    margin-top: 80rpx;
+}
+
+.two_three {
+    color: rgba(51, 51, 51, 1);
+    background: rgba(255, 255, 255, 1);
+    border: 1px solid rgba(224, 224, 224, 1);
+    margin-top: 36rpx;
+    box-shadow: 0 0 0 0 transparent;
+}

@@ -10,7 +10,7 @@ Page({
                 addressIndex: 0,
                 addressIndex: 0,
                 address: {},
                 address: {},
                 address_List: [],
                 address_List: [],
-                address__id: 4,
+                address__id: null,
                 chooseFlagAddress: false,
                 chooseFlagAddress: false,
                 timedat: '',
                 timedat: '',
                 showad: false,
                 showad: false,
@@ -66,7 +66,10 @@ Page({
                 optionsproId: '',
                 optionsproId: '',
                 optionspackId: '',
                 optionspackId: '',
                 optionscart: '',
                 optionscart: '',
-                timeflags:false
+                timeflags:false,
+                addd:null,
+                aamount: null,
+            dingdanid:null
         },
         },
         //changeTime
         //changeTime
         changeTime() {
         changeTime() {
@@ -76,16 +79,25 @@ Page({
         },
         },
         //检测选择时间的picker
         //检测选择时间的picker
         bindMultiPickerChange(e) {
         bindMultiPickerChange(e) {
+            if(this.data.panduan){
+                var addressId = this.data.deliverTimeId
+            } else {
+                var addressId = this.data.addd
+                }
                 this.setData({
                 this.setData({
                         multiIndex: e.detail.value,
                         multiIndex: e.detail.value,
-                        timeflag:false
+                        timeflag:false,
+                    deliverTimeId: addressId,
                 })
                 })
         },
         },
         //检测picker改变
         //检测picker改变
         bindMultiPickerColumnChange(e) {
         bindMultiPickerColumnChange(e) {
-                if (this.data.timeflags){
+                // if (this.data.timeflags){
+                    this.setData({
+                        panduan: true
+                    })
                       let that = this
                       let that = this
-                      var deliveryTimeId = that.data.deliverTimeId
+                      var deliveryTimeId = null
                       let column = e.detail.column
                       let column = e.detail.column
                       let data = {
                       let data = {
                               multiIndex: that.data.multiIndex,
                               multiIndex: that.data.multiIndex,
@@ -93,6 +105,7 @@ Page({
                               timeDataArray: that.data.timeDataArray
                               timeDataArray: that.data.timeDataArray
                       }
                       }
                       data.multiIndex[column] = e.detail.value;
                       data.multiIndex[column] = e.detail.value;
+                    console.log(e.detail.value+'shijiyaya')
                       switch (column) {
                       switch (column) {
                               case 0:
                               case 0:
                                       data.multiArray[1] = that.data.week_two[e.detail.value]
                                       data.multiArray[1] = that.data.week_two[e.detail.value]
@@ -107,23 +120,23 @@ Page({
                               if (e == c) {
                               if (e == c) {
                                       ele.children.forEach(function (eles, indexs) {
                                       ele.children.forEach(function (eles, indexs) {
                                               if (eles.disabled) {
                                               if (eles.disabled) {
-                                                      if (b == eles.label) {
-                                                              deliveryTimeId = eles.value
-                                                      }
-                                                      that.setData({
-                                                              timeflag: false
-                                                      })
+                                                  wx.showToast({
+                                                      title: '亲,该时间段已排满咯~',
+                                                      icon: 'none'
+                                                  })
+                                                  that.setData({
+                                                      timeflag: true
+                                                  })
+                                                  return
                                               } else {
                                               } else {
-                                                console.log(909090)
-                                                      wx.showToast({
-                                                              title: '亲,该时间段已排满咯~',
-                                                              icon: 'none'
-                                                      })
-                                                      that.setData({
-                                                              timeflag: true
-                                                      })
-                                                      deliveryTimeId = deliveryTimeId
-                                                      return
+                                                  if (b == eles.label) {
+                                                      console.log('b')
+                                                      deliveryTimeId = eles.value
+                                                      console.log('时间id'+eles.value)
+                                                  }
+                                                  that.setData({
+                                                      timeflag: false
+                                                  })
                                               }
                                               }
                                       })
                                       })
                               }
                               }
@@ -132,7 +145,7 @@ Page({
                       that.setData({
                       that.setData({
                               deliverTimeId: deliveryTimeId
                               deliverTimeId: deliveryTimeId
                       })
                       })
-              }
+            //   }
         },
         },
         //判断星期几
         //判断星期几
         getWeek() {
         getWeek() {
@@ -157,36 +170,43 @@ Page({
                         }
                         }
                         week_arr.push(ele.label)
                         week_arr.push(ele.label)
                         week_right.push(ele.arr)
                         week_right.push(ele.arr)
-                });
-                week_right.splice(count, 1)
-                let foo = week_arr.indexOf(week)
-                if (foo > -1) {
-                        week_arr.splice(foo, 1);
+            });
+            var i = null
+            week_right.forEach(function (elee,indexe) {
+                if (elee.length == 0) {
+                    i=indexe
+                    week_arr.splice(indexe, 1)
                 }
                 }
-                // weeks[0] = week_arr
-                // weeks[1] = week_right
-                // weeks[1] = ["13.00-15.00","15.00-17.00"]
+            })
+            week_right.splice(i,1)
+                console.log(week_right)
+                console.log(week_arr)
+                console.log(1414)
+                // week_right.splice(count, 1)
+            // let foo = week_arr.indexOf(week)
+            // console.log(foo)
+                // if (foo >= -1) {
+                        // week_arr.splice(count, 1);
+                // }else{
+
+                // }
                 var weeks_two = week_right
                 var weeks_two = week_right
-                console.log('000')
-          console.log(week_arr)
                 this.setData({
                 this.setData({
                         timeDataArray: canlda,
                         timeDataArray: canlda,
                         week_arr: week_arr,
                         week_arr: week_arr,
                         multiArray: weeks,
                         multiArray: weeks,
                         week_two: weeks_two
                         week_two: weeks_two
                 });
                 });
+                console.log('3232')
+                console.log(this.data.week_two)
                 this.start()
                 this.start()
         },
         },
         start() {
         start() {
                 let arr1 = this.data.week_two
                 let arr1 = this.data.week_two
                 let week_arr = this.data.week_arr
                 let week_arr = this.data.week_arr
-                console.log(arr1)
-                console.log(week_arr)
                 this.setData({
                 this.setData({
                         multiArray: [week_arr, arr1[0]]
                         multiArray: [week_arr, arr1[0]]
                 })
                 })
-                console.log(111)
-          console.log([week_arr, arr1[0]])
         },
         },
         //返回
         //返回
         get_my() {
         get_my() {
@@ -244,32 +264,43 @@ Page({
                 app.post(url, params).then(r => {
                 app.post(url, params).then(r => {
                         console.log(r)
                         console.log(r)
                         var list = r.data.list;
                         var list = r.data.list;
-                        var addid = null
                         r.data.vips.forEach(function(ele, index) {
                         r.data.vips.forEach(function(ele, index) {
                                 ele.t = false
                                 ele.t = false
                         });
                         });
+                        var n = 0
                         r.data.timeDataArray.forEach(function(ele, index) {
                         r.data.timeDataArray.forEach(function(ele, index) {
-                         if(index==0){
-                           addid = ele.children[0].value
-                         }
+                            ele.children.forEach(function(e,i){
+                                    if(!e.disabled){
+                                        n++
+                                        if (n == 1) {
+                                            addid = ele.children[0].value
+                                        }
+                                    }
+                            })
                                 var new_arr = []
                                 var new_arr = []
                                 for (let i = 0; i < ele.children.length; i++) {
                                 for (let i = 0; i < ele.children.length; i++) {
+                                    if (ele.children[i].disabled){
+
+                                    } else {
                                         new_arr.push(ele.children[i].label)
                                         new_arr.push(ele.children[i].label)
+                                    }
                                 }
                                 }
                                 ele.arr = new_arr
                                 ele.arr = new_arr
                         })
                         })
+                        var amount = that.data.amount + r.data.priceData.shipment_price
                         that.setData({
                         that.setData({
                                 vip: r.data,
                                 vip: r.data,
                                 goodsList: r.data.list,
                                 goodsList: r.data.list,
                                 addressList: r.data.address,
                                 addressList: r.data.address,
                                 address: r.data.address[0],
                                 address: r.data.address[0],
+                                address__id:r.data.address[0].id,
                                 vipList: r.data.vips,
                                 vipList: r.data.vips,
                                 timeDataArray: [],
                                 timeDataArray: [],
                                 timeDataArray: r.data.timeDataArray,
                                 timeDataArray: r.data.timeDataArray,
                                 deliverList: r.data.timeDataArray,
                                 deliverList: r.data.timeDataArray,
                                 addressList: r.data.address,
                                 addressList: r.data.address,
-                                amount: that.data.amount,
-                          addressId:addid
+                                amount:amount,
+                                 addd:addid
                         });
                         });
                   console.log(addid+'刚进来')
                   console.log(addid+'刚进来')
                         if (that.data.num == 0) {
                         if (that.data.num == 0) {
@@ -291,30 +322,43 @@ Page({
                 app.post(url, params).then(r => {
                 app.post(url, params).then(r => {
                         if (r.code == 1) {
                         if (r.code == 1) {
                                 var list = r.data.list;
                                 var list = r.data.list;
-                          r.data.timeDataArray.forEach(function (ele, index) {
-                            if (index == 0) {
-                              addid = ele.children[0].value
-                            }
-                                        var new_arr = []
-                                        for (let i = 0; i < ele.children.length; i++) {
-                                                new_arr.push(ele.children[i].label)
+                            var n = 0
+                            r.data.timeDataArray.forEach(function (ele, index) {
+                                ele.children.forEach(function (e, i) {
+                                    if (!e.disabled) {
+                                        n++
+                                        if (n == 1) {
+                                            addid = ele.children[0].value
                                         }
                                         }
-                                        ele.arr = new_arr
+                                    }
                                 })
                                 })
+                                var new_arr = []
+                                for (let i = 0; i < ele.children.length; i++) {
+                                    if (ele.children[i].disabled) {
+
+                                    } else {
+                                        new_arr.push(ele.children[i].label)
+                                    }
+                                }
+                                ele.arr = new_arr
+                            })
                                 that.setData({
                                 that.setData({
                                         vip: r.data,
                                         vip: r.data,
                                         goodsList: r.data.list,
                                         goodsList: r.data.list,
-                                        addressList: r.data.address,
+                                    addressList: r.data.address,
+                                    address: r.data.address[0],
+                                    address__id: r.data.address[0].id,
                                         vipList: r.data.vips,
                                         vipList: r.data.vips,
                                         timeDataArray: r.data.timeDataArray,
                                         timeDataArray: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
                                         ship_ment_price: r.data.priceData.shipment_price,
                                         ship_ment_price: r.data.priceData.shipment_price,
-                                        addressId:addid
+                                        addd:addid
                                 });
                                 });
                                 // that.fetchAmount();
                                 // that.fetchAmount();
                                 that.amount()
                                 that.amount()
                                 that.getWeek();
                                 that.getWeek();
                         } else {
                         } else {
+                            console.log(3333333333)
                                 wx.showToast({
                                 wx.showToast({
                                         title: r.msg,
                                         title: r.msg,
                                         icon: 'none'
                                         icon: 'none'
@@ -337,12 +381,15 @@ Page({
                                 that.setData({
                                 that.setData({
                                         vip: r.data,
                                         vip: r.data,
                                         goodsList: r.data.list,
                                         goodsList: r.data.list,
-                                        addressList: r.data.address,
+                                    addressList: r.data.address,
+                                    address: r.data.address[0],
+                                    address__id: r.data.address[0].id,
                                         vipList: r.data.vips,
                                         vipList: r.data.vips,
                                         ship_ment_price: r.data.priceData.shipment_price
                                         ship_ment_price: r.data.priceData.shipment_price
                                 });
                                 });
                                 that.amount();
                                 that.amount();
                         } else {
                         } else {
+                            console.log(11111111)
                                 wx.showToast({
                                 wx.showToast({
                                         title: r.msg,
                                         title: r.msg,
                                         icon: 'none',
                                         icon: 'none',
@@ -366,25 +413,37 @@ Page({
                 var totalPrice = that.data.totalPrice
                 var totalPrice = that.data.totalPrice
                 app.post(url, params).then(r => {
                 app.post(url, params).then(r => {
                         if (r.code == 1) {
                         if (r.code == 1) {
-                          r.data.timeDataArray.forEach(function (ele, index) {
-                            if (index == 0) {
-                              addid = ele.children[0].value
-                            }
-                                        var new_arr = []
-                                        for (let i = 0; i < ele.children.length; i++) {
-                                                new_arr.push(ele.children[i].label)
+                            var n = 0
+                            r.data.timeDataArray.forEach(function (ele, index) {
+                                ele.children.forEach(function (e, i) {
+                                    if (!e.disabled) {
+                                        n++
+                                        if (n == 1) {
+                                            addid = ele.children[0].value
                                         }
                                         }
-                                        ele.arr = new_arr
+                                    }
                                 })
                                 })
+                                var new_arr = []
+                                for (let i = 0; i < ele.children.length; i++) {
+                                    if (ele.children[i].disabled) {
+
+                                    } else {
+                                        new_arr.push(ele.children[i].label)
+                                    }
+                                }
+                                ele.arr = new_arr
+                            })
                                 this.setData({
                                 this.setData({
                                         vip: r.data,
                                         vip: r.data,
                                         goodsList: r.data.list,
                                         goodsList: r.data.list,
-                                        addressList: r.data.address,
+                                    addressList: r.data.address,
+                                    address: r.data.address[0],
+                                    address__id: r.data.address[0].id,
                                         vipList: r.data.vips,
                                         vipList: r.data.vips,
                                         timeDataArray: r.data.timeDataArray,
                                         timeDataArray: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
                                         ship_ment_price: r.data.priceData.shipment_price,
                                         ship_ment_price: r.data.priceData.shipment_price,
-                                        addressId:addid
+                                        addd:addid
                                 })
                                 })
                                 this.getWeek();
                                 this.getWeek();
                         }
                         }
@@ -434,16 +493,26 @@ Page({
                 app.post(url, params).then(r => {
                 app.post(url, params).then(r => {
                         if (r.code == 1) {
                         if (r.code == 1) {
                                 console.log(r)
                                 console.log(r)
-                          r.data.timeDataArray.forEach(function (ele, index) {
-                            if (index == 0) {
-                              addid = ele.children[0].value
-                            }
-                                        var new_arr = []
-                                        for (let i = 0; i < ele.children.length; i++) {
-                                                new_arr.push(ele.children[i].label)
+                            var n = 0
+                            r.data.timeDataArray.forEach(function (ele, index) {
+                                ele.children.forEach(function (e, i) {
+                                    if (!e.disabled) {
+                                        n++
+                                        if (n == 1) {
+                                            addid = ele.children[0].value
                                         }
                                         }
-                                        ele.arr = new_arr
+                                    }
                                 })
                                 })
+                                var new_arr = []
+                                for (let i = 0; i < ele.children.length; i++) {
+                                    if (ele.children[i].disabled) {
+
+                                    } else {
+                                        new_arr.push(ele.children[i].label)
+                                    }
+                                }
+                                ele.arr = new_arr
+                            })
                                 r.data.list.forEach(function(ele, index) {
                                 r.data.list.forEach(function(ele, index) {
                                         ele.price.substring(0, ele.price.length - 3)
                                         ele.price.substring(0, ele.price.length - 3)
                                         ele.price = ele.price * 1
                                         ele.price = ele.price * 1
@@ -453,7 +522,9 @@ Page({
                                 that.setData({
                                 that.setData({
                                         vip: r.data,
                                         vip: r.data,
                                         goodsList: r.data.list,
                                         goodsList: r.data.list,
-                                        addressList: r.data.address,
+                                    addressList: r.data.address,
+                                    address: r.data.address[0],
+                                    address__id: r.data.address[0].id,
                                         vipList: r.data.vips,
                                         vipList: r.data.vips,
                                         timeDataArray: r.data.timeDataArray,
                                         timeDataArray: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
                                         deliverList: r.data.timeDataArray,
@@ -461,7 +532,7 @@ Page({
                                         amount: price,
                                         amount: price,
                                         goodsTotalPrice: price,
                                         goodsTotalPrice: price,
                                         last_total_price: price,
                                         last_total_price: price,
-                                        addressId: addid
+                                        addd: addid
                                 });
                                 });
                                 this.getWeek();
                                 this.getWeek();
                         }
                         }
@@ -514,6 +585,14 @@ Page({
                         url = '/wxapp/cart/confirm'
                         url = '/wxapp/cart/confirm'
                 } else {
                 } else {
                         url = '/wxapp/cart/confirm2'
                         url = '/wxapp/cart/confirm2'
+            }
+            console.log(that.data.deliverTimeId + "配送时间ids")
+            if (that.data.deliverTimeId==undefined){
+                    wx.showToast({
+                        title: '请选择配送时间',
+                        icon:'none'
+                    })
+                    return;
                 }
                 }
                 if (that.data.num != 0 && that.data.is_group == 0) {
                 if (that.data.num != 0 && that.data.is_group == 0) {
                         console.log("商品直接购买")
                         console.log("商品直接购买")
@@ -786,26 +865,29 @@ Page({
                                 }
                                 }
                         }
                         }
                 }
                 }
-                console.log(params.delivery_time + "配送时间id")
                 if (that.data.last_total_price > 0) {
                 if (that.data.last_total_price > 0) {
                         // if (that.data.amount > 0) {
                         // if (that.data.amount > 0) {
                         if (that.data.is_group == 0) {
                         if (that.data.is_group == 0) {
-                                if (that.data.addressFlag) {
-                                        wx.showToast({
-                                                title: '请选择收货地址',
-                                                icon: 'none'
-                                        })
-                                } else if (params.delivery_time == 0) {
-                                        wx.showToast({
-                                                title: '请选择配送时间',
-                                                icon: 'none'
-                                        })
-                                } else {
+                                // if (that.data.addressFlag) {
+                                //         wx.showToast({
+                                //                 title: '请选择收货地址',
+                                //                 icon: 'none'
+                                //         })
+                                // } else if (params.delivery_time == 0) {
+                                //         wx.showToast({
+                                //                 title: '请选择配送时间',
+                                //                 icon: 'none'
+                                //         })
+                                // } else {
                                         app.post(url, params).then(res => {
                                         app.post(url, params).then(res => {
                                                 if (res.code == 1) {
                                                 if (res.code == 1) {
                                                         var order_sn = res.data.order_sn
                                                         var order_sn = res.data.order_sn
+                                                        var amount = res.data.amount
+                                                        var dingdanid = res.data.order_id
                                                         that.setData({
                                                         that.setData({
-                                                                order_sn: order_sn
+                                                                order_sn: order_sn,
+                                                                aamount: amount,
+                                                                dingdanid:dingdanid
                                                         });
                                                         });
                                                         let url = '/wxapp/pay/index?order_sn=' + order_sn
                                                         let url = '/wxapp/pay/index?order_sn=' + order_sn
                                                         app.post(url).then(r => {
                                                         app.post(url).then(r => {
@@ -825,6 +907,9 @@ Page({
                                                                                                 that.setData({
                                                                                                 that.setData({
                                                                                                         showad: true
                                                                                                         showad: true
                                                                                                 })
                                                                                                 })
+                                                                                                wx.navigateTo({
+                                                                                                    url: '../paySuccess/paySuccess?order='+dingdanid+'&amount='+that.data.aamount,
+                                                                                                })
                                                                                                 console.log(showad+"真假值")
                                                                                                 console.log(showad+"真假值")
                                                                                         },
                                                                                         },
                                                                                         fail(res) {
                                                                                         fail(res) {
@@ -840,7 +925,10 @@ Page({
                                                                                         wx.showToast({
                                                                                         wx.showToast({
                                                                                                 title: '支付成功',
                                                                                                 title: '支付成功',
                                                                                                 icon: 'none'
                                                                                                 icon: 'none'
-                                                                                        })
+                                                                                    })
+                                                                                    wx.navigateTo({
+                                                                                        url: '../paySuccess/paySuccess?order=' + dingdanid + '&amount=' + that.data.aamount,
+                                                                                    })
                                                                                         wx.switchTab({
                                                                                         wx.switchTab({
                                                                                                 url: '../../index/index',
                                                                                                 url: '../../index/index',
                                                                                         })
                                                                                         })
@@ -853,7 +941,10 @@ Page({
                                                                                                         signType: r.data.jsApiParameters.signType,
                                                                                                         signType: r.data.jsApiParameters.signType,
                                                                                                         paySign: r.data.jsApiParameters.paySign,
                                                                                                         paySign: r.data.jsApiParameters.paySign,
                                                                                                         success(res) {
                                                                                                         success(res) {
-                                                                                                                console.log(res);
+                                                                                                            console.log(res);
+                                                                                                            wx.navigateTo({
+                                                                                                                url: '../paySuccess/paySuccess?order=' + dingdanid + '&amount=' + that.data.aamount,
+                                                                                                            })
                                                                                                         },
                                                                                                         },
                                                                                                         fail(res) {
                                                                                                         fail(res) {
                                                                                                                 wx.navigateTo({
                                                                                                                 wx.navigateTo({
@@ -885,14 +976,14 @@ Page({
                                                         return
                                                         return
                                                 }
                                                 }
                                         })
                                         })
-                                }
+                                // }
                         } else {
                         } else {
-                                if (that.data.addressFlag) {
-                                        wx.showToast({
-                                                title: '请选择收货地址',
-                                                icon: 'none'
-                                        })
-                                } else {
+                                // if (that.data.addressFlag) {
+                                //         wx.showToast({
+                                //                 title: '请选择收货地址',
+                                //                 icon: 'none'
+                                //         })
+                                // } else {
                                         app.post(url, params).then(res => {
                                         app.post(url, params).then(res => {
                                                 if (res.code == 1) {
                                                 if (res.code == 1) {
                                                         var order_sn = res.data.order_sn
                                                         var order_sn = res.data.order_sn
@@ -961,6 +1052,7 @@ Page({
                                                                                 }
                                                                                 }
                                                                         }
                                                                         }
                                                                 } else {
                                                                 } else {
+                                                                    console.log(2222222222)
                                                                         wx.showToast({
                                                                         wx.showToast({
                                                                                 title: r.msg,
                                                                                 title: r.msg,
                                                                                 icon: 'none'
                                                                                 icon: 'none'
@@ -969,7 +1061,7 @@ Page({
                                                         });
                                                         });
                                                 }
                                                 }
                                         })
                                         })
-                                }
+                                // }
                         }
                         }
                 } else {
                 } else {
                         wx.showToast({
                         wx.showToast({

@@ -11,13 +11,11 @@
                 <!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> -->
                 <!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> -->
                 <picker mode="multiSelector" wx:if='{{is_group==0}}' class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
                 <picker mode="multiSelector" wx:if='{{is_group==0}}' class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
 <view class="picker_class">
 <view class="picker_class">
-<view class='zhanman'>
 <view class='iconfont icon-time'></view>
 <view class='iconfont icon-time'></view>
-<text class='hint' wx:if='{{timeflag}}'>选择时间</text>
-<text class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</text>
+<view class='hint' wx:if='{{timeflag}}'>选择时间</view>
+<view class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</view>
 
 
 <view class='centers'>送达</view>
 <view class='centers'>送达</view>
-</view>
 <view class='iconfont icon-jinru add_left'></view>
 <view class='iconfont icon-jinru add_left'></view>
 </view>
 </view>
 </picker>
 </picker>
@@ -28,9 +26,10 @@
                 </view>
                 </view>
                 <view class='expected_time' bindtap='openAddress'>
                 <view class='expected_time' bindtap='openAddress'>
                     <view class='iconfont icon-position'></view>
                     <view class='iconfont icon-position'></view>
-                    <text wx:if='{{addressFlag}}'>请选择收货地址</text>
-                    <text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>
-                    <view class='iconfont icon-jinru dec_left {{address_jinru?"active":""}}'></view>
+                    <!-- <text wx:if='{{addressFlag}}'>请选择收货地址</text> -->
+                    <!-- <text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text> -->
+                    <text  class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>
+                    <view class='iconfont icon-jinru dec_left active'></view>
                 </view>
                 </view>
             </view>
             </view>
 
 

@@ -16,18 +16,6 @@ box-sizing: border-box;
 .pages.activity{
 .pages.activity{
   overflow: hidden
   overflow: hidden
 }
 }
-.flex_box {
-width: 100%;
-}
-
-.picker_class {
-width: 100%;
-display: flex;
-justify-content: space-between;
-align-items: center;
-box-sizing: border-box;
-position: relative;
-}
 .scroll{
 .scroll{
   width: 100%;
   width: 100%;
   /* height: calc(100% - 600rpx); */
   /* height: calc(100% - 600rpx); */
@@ -120,7 +108,8 @@ position: relative;
   margin-right: 18rpx;
   margin-right: 18rpx;
   color:rgba(255,68,68,1);
   color:rgba(255,68,68,1);
   /* float: left; */
   /* float: left; */
-  display: inline-block
+  display: inline-block;
+
 }
 }
 .zhanman{
 .zhanman{
         /* width: 100%; */
         /* width: 100%; */
@@ -131,7 +120,7 @@ position: relative;
   /* float: left; */
   /* float: left; */
   display: inline-block;
   display: inline-block;
   color:rgba(34,34,34,1); 
   color:rgba(34,34,34,1); 
-  padding-right:16rpx;
+  padding-right:26rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   flex-grow: 1;
   flex-grow: 1;
   overflow: hidden;
   overflow: hidden;
@@ -166,10 +155,8 @@ position: relative;
 .dec_left{
 .dec_left{
   position: absolute;
   position: absolute;
   right: 0rpx;
   right: 0rpx;
-  top: 24rpx;
-}
-.dec_left.active{
-  top: 4rpx
+  top: 50%;
+  transform: translateY(-50%)
 }
 }
 .hint2 {
 .hint2 {
   font-size: 22rpx;
   font-size: 22rpx;
@@ -635,4 +622,18 @@ line-height: 45rpx;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
+}
+
+.flex_box {
+width: 100%;
+/* background: red */
+}
+
+.picker_class {
+width: 100%;
+display: flex;
+justify-content: space-between;
+align-items: center;
+box-sizing: border-box;
+position: relative;
 }
 }

@@ -14,6 +14,7 @@ Page({
                 totalPrice: 0,
                 totalPrice: 0,
                 cancel_order:false,
                 cancel_order:false,
                 cancel_value: '',
                 cancel_value: '',
+                amount: null,
                 sale_arr: [],
                 sale_arr: [],
                 cancel_reason: [{ id: 1, name: '我不想买了' }, { id: 2, name: '卖家缺货' }, { id: 3, name: '多拍了' }, { id: 4, name: '服务太差' }, { id: 5, name: '信息填写错误' }, { id: 6, name: '再等等' }, { id: 7, name: '其他原因' }],
                 cancel_reason: [{ id: 1, name: '我不想买了' }, { id: 2, name: '卖家缺货' }, { id: 3, name: '多拍了' }, { id: 4, name: '服务太差' }, { id: 5, name: '信息填写错误' }, { id: 6, name: '再等等' }, { id: 7, name: '其他原因' }],
         },
         },
@@ -83,7 +84,7 @@ Page({
                                                 success(res) {
                                                 success(res) {
                                                         console.log(res);
                                                         console.log(res);
                                                         wx.navigateTo({
                                                         wx.navigateTo({
-                                                                url: '../myOrder/myOrder?status='+2,
+                                                            url: '../paySuccess/paySuccess?order=' + pay_order_sn+'&amount='+this.data.amount,
                                                         })
                                                         })
                                                 },
                                                 },
                                                 fail(res) {
                                                 fail(res) {
@@ -184,7 +185,8 @@ Page({
                                 delivery_time: delivery_time,
                                 delivery_time: delivery_time,
                                 totalPrice: totalPrice,
                                 totalPrice: totalPrice,
                                 sale_arr: arr,
                                 sale_arr: arr,
-                                More:More
+                                More:More,
+                                amount: r.data.info.amount
                         });
                         });
                 })
                 })
         },
         },

@@ -35,7 +35,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 93,
+			"current": 94,
 			"list": [
 			"list": [
 				{
 				{
 					"id": -1,
 					"id": -1,
@@ -694,6 +694,12 @@
 					"pathName": "pages/my/wait_receite/wait_receite",
 					"pathName": "pages/my/wait_receite/wait_receite",
 					"query": "",
 					"query": "",
 					"scene": null
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "支付成功页",
+					"pathName": "pages/my/paySuccess/paySuccess",
+					"scene": null
 				}
 				}
 			]
 			]
 		}
 		}