[周五福利订阅]

api/interfaces/index.js

@@ -73,6 +73,15 @@ const fridayPay = (trade_no) => req({url: "payments/welfare/wechat",method: "POS
 //洗车券-获取跳转地址
 const washcarUrl = (welfare_id, right_config_id) => req({url: "washcar/infourl", data: {welfare_id: welfare_id, right_config_id: right_config_id}})
 
+//首页轮播-跳转本页面 --业务数据查看
+const busineSee = (business) => req({url: "business/" + business})
+
+//首页轮播-跳转本页面 --业务数据预约表单
+const busineForm = (business_id, business_item_id, type, mobile, username) => req({url: "business/create",method: "POST", data: {business_id: business_id, business_item_id: business_item_id, type: type, mobile: mobile, username: username}})
+
+//订阅
+const subscribe = (subscribe) => req({url: "wechat/" + subscribe + "/welfare_subscribe",method: "POST"})
+
 export default({
 	index,
 	choice,
@@ -97,5 +106,8 @@ export default({
 	newidxCity,
 	fridayInfo,
 	fridayPay,
-	washcarUrl
+	washcarUrl,
+	busineSee,
+	busineForm,
+	subscribe
 })

api/interfaces/user.js

@@ -38,7 +38,7 @@ const jssdk = (coupon_id) => req({url: "coupons/jssdk?coupon_id=" + coupon_id})
 const cards = (code, pass) => req({url: "user/cards/activate", method: "POST", data:{code : code, pass : pass}})
 
 // 积分账变记录
-const logs = (type, page) => req({url: "account/logs", data:{type : type, page : page}})
+const logs = (type, channel, page) => req({url: "account/logs", data:{type : type, channel: channel, page : page}})
 
 // 冻结列表
 const ungrants = (type,) => req({url: "account/ungrants", data:{type : type}})

app.json

@@ -26,7 +26,8 @@
         "pages/frozen/frozen",
         "pages/welfare/welfare",
         "pages/classify/classify",
-        "pages/washcar/washcar"
+        "pages/washcar/washcar",
+        "pages/makeForm/makeForm"
     ],
     "window": {
         "backgroundTextStyle": "light",

pages/account/account.js

@@ -9,8 +9,23 @@ Page({
         number      : '',       //账户余额
         accounts    : '',       //账户列表
         blockeds    : '',       //待发放余额
-        page        : {},        //分页信息
+        page        : {},       //分页信息
-        lodingStats : false,     //加载状态
+        lodingStats : false,    //加载状态
+        screenArray: [
+            {
+                channel: 'all',
+                name: '全部'
+            },
+            {
+                channel: 'in',
+                name: '入账'
+            },
+            {
+                channel: 'out',
+                name: '出账'
+            }
+        ],                   //账变记录筛选数组
+        screenIndex: 0       //账变记录筛选index
     },
 
     /**

pages/account/account.wxml

@@ -20,7 +20,16 @@
 </view>
 
 <view class="integra-cont" wx:if="{{accounts != ''}}">
-	<view class="integra-cont-name">入账记录</view>
+	<view class="integra-cont-title">
+		<view class="integra-cont-name">账变记录</view>
+		<view class="integra-cont-picker">
+			<picker bindchange="screenBind" value="{{screenArray[screenIndex].channel}}" range="{{screenArray}}">
+				{{screenArray[screenIndex].name}}
+			</picker>
+			<image class="integra-cont-icon" src="/static/icon/arrow_down.png"></image>
+		</view>
+		
+	</view>
 	<view class="integra-list" wx:for="{{accounts}}" wx:key="integras">
 		<view class="integra-text">
 			<view class="integra-title">

pages/account/account.wxss

@@ -1,7 +1,12 @@
 /* 积分 */
-.integra-cont-name {
+.integra-cont-title {
     padding: 40rpx 20rpx 10rpx;
+    display: flex;
+}
+
+.integra-cont-name {
     font-weight: 600;
+    flex: 1;
 }
 
 .integra-list {
@@ -12,6 +17,18 @@
     box-sizing: border-box;
 }
 
+.integra-cont-picker {
+    display: flex;
+    color: #797979;
+    font-size: 30rpx;
+}
+
+.integra-cont-icon {
+    width: 28rpx;
+    height: 28rpx;
+    margin: 6rpx 0 0 10rpx;
+}
+
 .integra-top {
     padding: 30rpx 20rpx 0;
     background-color: #dfb48b;
@@ -96,10 +113,11 @@
 .integra-list {
     padding: 30rpx 20rpx;
     position: relative;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, .1);
     box-sizing: border-box;
 }
 
-.integra-list::after {
+/* .integra-list::after {
     position: absolute;
     content: '';
     left: 0;
@@ -107,7 +125,7 @@
     width: 100%;
     height: 2rpx;
     background: #eaeaea;
-}
+} */
 
 .integra-list:last-child::after {
     display: none;

pages/frozen/frozen.js

@@ -10,6 +10,7 @@ Page({
      * 页面的初始数据
      */
     data: {
+        current     : 0,  //轮播标
         type        : '', //类型
         frozenData  : [], //数组列表
         blockeds    : '', //待发放金额

pages/frozen/frozen.json

@@ -1,4 +1,6 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "待发放"
+  "navigationBarTitleText": "待发放",
+  "navigationBarBackgroundColor": "#24315d",
+  "navigationBarTextStyle": "white"
 }

pages/frozen/frozen.wxml

@@ -1,5 +1,5 @@
 <!-- 分期 -->
-<view class="frozenTop">
+<!-- <view class="frozenTop">
     <view class="frozenTop-text">
         <view class="frozenTop-name">待发放（额度）</view>
         <view class="frozenTop-number">{{blockeds}}</view>
@@ -19,10 +19,214 @@
             <view class="frozenList-variable">发放额度</view>
         </view>
     </view>
-</view>
+</view> -->
 
 <!-- 暂无内容 -->
-<view class="pack-center pages-hint" wx:else>
+<!-- <view class="pack-center pages-hint" wx:else>
 	<image src="https://storage.funnyzhibo.com/images/2020/05/06/staff_null.png"></image>
 	<view>抱歉，目前暂无内容~</view>
+</view> -->
+
+
+<view class="grantSwiper">
+    <swiper class="banner-swiper" bindchange="monitorCurrent" current="{{current}}">
+        <swiper-item bindtap="userUrl">
+            <view class="banner-height">
+                <view class="grantTop">
+                    <image class="grantTop-img" src="/static/img/frozen_back.png" mode="scaleToFill"></image>
+                    <view class="grantTop-text">
+                        <image src="/static/img/frozen_identity.png"></image>
+                        <view class="grantTop-price">
+                            <text>待发放(额度)</text>
+                            0
+                        </view>
+                    </view>
+                    <view class="grantTop-tips">
+                        <view class="grantTop-time">发放周期 2021.06.22 ~ 2022.06.22</view>
+                        <view class="grantTop-number">共0期</view>
+                    </view>
+                </view>
+                <view class="grantTitle">
+                    <view class="grantTitle-name">权益名称</view>
+                    <view class="grantTitle-tel">13836142496</view>
+                </view>
+            </view>
+            <view class="grantIssue">
+                <view class="grantIssue-title">
+                    <view class="grantIssue-title-name">
+                        <image src="/static/img/frozen_icon.png"></image><text>账户余额分期</text>
+                    </view>
+                    <view class="grantIssue-title-tips">共分<text>24期</text>发放，一共<text>1254</text>积分。到账即可使用</view>
+                </view>
+                <view class="grantIssue-list">
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>1</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>2</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>3</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>4</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>5</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>6</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>7</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                    <view class="grantIssue-label">
+                        <image class="grantIssue-label-img" src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                        <view class="grantIssue-label-cont">
+                            <view class="grantIssue-label-left">
+                                <view class="grantIssue-left-top">第<text>8</text>期</view>
+                                <view class="grantIssue-left-number">共<text>24</text>期</view>
+                            </view>
+                            <view class="grantIssue-label-center">
+                                <view class="grantIssue-center-top"><text>120</text>( 发放额度 )</view>
+                                <view class="grantIssue-center-time">发放时间：2021-06-22</view>
+                            </view>
+                            <view class="grantIssue-label-right">
+                                待发放
+                            </view>
+                        </view>
+                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
+                        </image>
+                    </view>
+                </view>
+            </view>
+        </swiper-item>
+        <swiper-item bindtap="userUrl">
+            2
+        </swiper-item>
+    </swiper>
+</view>
+
+<view class="frozenArrow">
+    <view class="frozenArrow-left">
+        <image src="/static/icon/frozen_arrow.png"></image>
+        向右滑动
+    </view>
+    <view class="frozenArrow-right">
+        <image src="/static/icon/frozen_arrow.png"></image>
+        向左滑动
+    </view>
+</view>
+
+<!-- 自定义轮播图进度点 -->
+<view class="dots">
+    <!-- wx:for="{{adverts}}" wx:key="cardBanner" -->
+    <block>
+        <view class='{{index == swiperCurrent ? "active":""}}'></view>
+    </block>
 </view>

pages/frozen/frozen.wxss

@@ -98,4 +98,350 @@
 .frozenList-yellow {
     color: #317afa;
     font-weight: 600;
+}
+
+
+/* 最新样式  2021-06-22 */
+page {
+    background-image: linear-gradient(to bottom, #24315d, #24315d);
+}
+
+.banner-swiper {
+    height: 100vh;
+}
+
+.grantSwiper {
+    width: 100%;
+    height: 100vh;
+    padding: 0 80rpx;
+    box-sizing: border-box;
+}
+
+.banner-height {
+    height: 460rpx;
+    margin-top: 30rpx;
+}
+
+.grantTop {
+    position: relative;
+    width: 100%;
+    height: 300rpx;
+    color: #ffdf95;
+}
+
+.grantTop-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+.grantTop-text,
+.grantTop-tips {
+    position: absolute;
+    z-index: 9;
+    left: 0;
+    width: 100%;
+}
+
+.grantTop-text {
+    top: 0;
+    padding: 40rpx 60rpx;
+    box-sizing: border-box;
+}
+
+.grantTop-text image {
+    width: 120rpx;
+    height: 40rpx;
+}
+
+.grantTop-price {
+    text-align: center;
+    font-size: 60rpx;
+}
+
+.grantTop-price text {
+    font-size: 30rpx;
+    display: block;
+    color: #fff;
+}
+
+.grantTop-tips {
+    bottom: 0;
+    font-size: 26rpx;
+    display: flex;
+    line-height: 70rpx;
+    height: 70rpx;
+    padding: 0 40rpx;
+    box-sizing: border-box;
+}
+
+.grantTop-time {
+    flex: 1;
+}
+
+.grantTitle {
+    background-color: #3d4963;
+    border-radius: 15rpx;
+    margin: 40rpx 0;
+    width: 100%;
+    display: flex;
+    color: #d3d5e1;
+    height: 90rpx;
+    overflow: hidden;
+}
+
+.grantTitle-name,
+.grantTitle-tel {
+    box-sizing: border-box;
+    height: 90rpx;
+    line-height: 90rpx;
+    font-size: 32rpx;
+}
+
+.grantTitle-name {
+    padding-left: 30rpx;
+    font-weight: 600;
+    background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
+    -webkit-background-clip:text;
+    -webkit-text-fill-color:transparent;
+    flex: 1;
+}
+
+.grantTitle-tel {
+    padding: 0 30rpx 0 20rpx;
+    background-color: #192845;
+    position: relative;
+}
+
+.grantTitle-tel::after {
+    position: absolute;
+    content: '';
+    left: -20rpx;
+    top: 0;
+	width:0;
+	height:0;
+	border-left: 20rpx solid transparent;
+	border-right: 20rpx solid transparent;
+	border-bottom: 90rpx solid #192845;
+}
+
+.grantIssue-title {
+    height: 120rpx;
+}
+
+.grantIssue-title-name {
+    line-height: 44rpx;
+    display: flex;
+}
+
+.grantIssue-title-name image {
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 20rpx;
+}
+
+.grantIssue-title-name text {
+    font-weight: 600;
+    font-size: 34rpx;
+    background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
+    -webkit-background-clip:text;
+    -webkit-text-fill-color:transparent;
+}
+
+.grantIssue-title-tips {
+    font-size: 26rpx;
+    margin: 10rpx 0 30rpx;
+    color: #d2d6e2;
+}
+
+.grantIssue-title-tips text {
+    color: #dcbc8d;
+}
+
+.grantIssue {
+    height: calc(100vh - 550rpx);
+}
+
+.grantIssue-list {
+    overflow-y: scroll;
+    height: calc(100% - 140rpx);
+}
+
+.grantIssue-label {
+    position: relative;
+    height: 180rpx;
+    margin-bottom: 30rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    background-color: #f9dabb;
+}
+
+.grantIssue-label:last-child {
+    margin-bottom: 0;
+}
+
+.grantIssue-label-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+}
+
+.grantIssue-label-cont {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    z-index: 6;
+    padding: 20rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+.grantIssue-label-left {
+    width: 120rpx;
+    text-align: center;
+    margin-top: 20rpx;
+}
+
+.grantIssue-left-top {
+    color: #e9083d;
+    font-size: 26rpx;
+}
+
+.grantIssue-left-top text {
+    font-size: 34rpx;
+    font-weight: 600;
+    padding: 0 6rpx;
+}
+
+.grantIssue-left-number {
+    background:-webkit-linear-gradient(left,#ffdca4,#f8af52);
+    color: #b13509;
+    border-radius: 30rpx;
+    display: inline-block;
+    font-size: 22rpx;
+    height: 42rpx;
+    line-height: 42rpx;
+    padding: 0 15rpx;
+    margin-top: 12rpx;
+}
+
+.grantIssue-label-right {
+    width: 90rpx;
+    font-weight: 600;
+    text-align: center;
+    font-size: 30rpx;
+    color: #3d2a26;
+    line-height: 140rpx;
+}
+
+.grantIssue-label-center {
+    width: calc(100% - 250rpx);
+    margin: 20rpx 20rpx 0 20rpx;
+}
+
+.grantIssue-center-top {
+    font-size: 26rpx;
+    color: #0f004a;
+    font-weight: 600;
+    margin-bottom: 8rpx;
+}
+
+.grantIssue-center-top text {
+    font-size: 40rpx;
+    padding-right: 10rpx;
+}
+
+.grantIssue-center-time {
+    font-size: 26rpx;
+    color: #757575;
+}
+
+.grantIssue-label-tips {
+    position: absolute;
+    width: 140rpx;
+    height: 100%;
+    right: 0;
+    top: 0;
+}
+
+
+/* 滑动箭头 */
+.frozenArrow-left,
+.frozenArrow-right {
+    position: fixed;
+    z-index: 9;
+    top: 35%;
+    width: 40rpx;
+    height: 40rpx;
+    text-align: center;
+    writing-mode:lr-tb;
+    color: #f0cba8;
+    font-size: 24rpx;
+}
+
+.frozenArrow-left image,
+.frozenArrow-right image {
+    width: 24rpx;
+    height: 24rpx;
+}
+
+.frozenArrow-left {
+    left: 10rpx;
+    -webkit-animation: bounce-left 1s linear infinite;
+    animation: bounce-left 1s linear infinite;
+}
+
+.frozenArrow-right {
+    right: 10rpx;
+    -webkit-animation: bounce-right 1s linear infinite;
+    animation: bounce-right 1s linear infinite;
+}
+
+.frozenArrow-left image {
+    transform:rotate(180deg);
+    -moz-transform:rotate(180deg);
+    -webkit-transform:rotate(180deg);
+}
+
+@keyframes bounce-left {
+    25% {transform: translateX(3px);}
+    50%, 100% {transform: translateX(0);}
+    75% {transform: translateX(-3px);}
+}
+
+@keyframes bounce-right {
+    25% {transform: translateX(-3px);}
+    50%, 100% {transform: translateX(0);}
+    75% {transform: translateX(3px);}
+}
+
+
+/* 指示点 */
+.dots {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    position: fixed;
+    bottom: 20rpx;
+    height: 40rpx;
+}
+
+.dots view {
+    width: 14rpx;
+    height: 14rpx;
+    margin: 0 6rpx;
+    border-radius: 50%;
+    background-color: #c5c5c5;
+}
+
+.dots .active {
+    width: 24rpx;
+    border-radius: 40rpx;
+    background-color: #f46851;
 }

pages/index/index.js

@@ -20,7 +20,7 @@ Page({
         longitude       : 0,      //经度
         latitude        : 0,      //纬度
         adverts         : [],     //轮播图
-        stateType       : "silver",
+        stateType       : "shaky",
         cardArr         : [],     //权益数组
         activities      : [],     //周五福利
         isUser          : false, //用户登录状态
@@ -70,6 +70,7 @@ Page({
     indexInfo() {
         if(this.data.stateType == 'shaky') {
             wx.$api.index.index(this.data.city, this.data.longitude, this.data.latitude).then(res=>{
+                console.log(res.data.adverts)
                 this.setData({
                     adverts     : res.data.adverts,
                     cardArr     : res.data.rights,
@@ -95,6 +96,7 @@ Page({
             })
         } else {
             wx.$api.index.choice(this.data.stateType,this.data.city, this.data.longitude, this.data.latitude).then(res=>{
+                console.log(res.data.adverts)
                 this.setData({
                     adverts     : res.data.adverts,
                     cardArr     : res.data.categorys,
@@ -166,15 +168,39 @@ Page({
     },
 
     /**
-     * 点击图片放大
+     * 点击轮播图片
      */
     clickImg(e) {
-        if(e.currentTarget.dataset.img == "") return
+        console.log(e.currentTarget.dataset)
-        let imgUrl = [e.currentTarget.dataset.img]
+        let newChannel = e.currentTarget.dataset.channel,
-        wx.previewImage({
+            newImg     = e.currentTarget.dataset.img,
-            urls        :  imgUrl, //需要预览的图片http链接列表，注意是数组
+            newUrl     = e.currentTarget.dataset.url
-            current     :  imgUrl[0] // 当前显示图片的http链接，默认是第一个
+
-        })        
+        // 点击图片放大
+        if (newChannel == 'image') {
+            if(newImg == "") return
+            let imgUrl = [newImg]
+            wx.previewImage({
+                urls        :  imgUrl, //需要预览的图片http链接列表，注意是数组
+                current     :  imgUrl[0] // 当前显示图片的http链接，默认是第一个
+            }) 
+        }
+
+        // 跳转内网
+        if (newChannel == 'pages') {
+            wx.navigateTo({
+              url: newUrl
+            })
+        }
+
+        // 跳转外网
+        if (newChannel == 'url') {
+            let url= encodeURIComponent(newUrl)
+            wx.redirectTo({
+                // 跳转到webview页面
+                url: `/pages/webView/webView?url=${url}`
+            });
+        }
     },
 
     /**
@@ -293,6 +319,32 @@ Page({
         else {//正常轮转时，记录正确页码索引
             this.setData({ swiperCurrent: e.detail.current });
         }
-    
+    },
+
+    /**
+     * 订阅
+     */
+    subscribeTap() {
+        wx.requestSubscribeMessage({
+            tmplIds: ['g8cEL-Tf2_Pdh8VyBdsYbhv09VVm8om-ZblhXIaVDiY'],
+            success: res=> {
+                if(res.errMsg == "requestSubscribeMessage:ok") {
+                    wx.$api.index.subscribe(1).then(res=>{
+                        wx.showLoading({
+                            title: res.data,
+                            icon : 'none',
+                        })
+                        setTimeout(function () {
+                            wx.hideLoading();
+                        }, 1000)
+                    }).catch(err=>{
+                        
+                    })
+                }
+            },
+            fail: err => {
+                console.log(err)
+            }
+        })
     }
 })

pages/index/index.wxml

@@ -5,7 +5,9 @@
 	<!-- 定位 -->
 	<view class="locationPicker" style="padding-top:{{statusBarHeight}}px;">
 		<image class="locationPicker-icon" src="/static/icon/indexSite.png"></image>
-		<navigator url="/pages/switchcity/switchcity?city_code={{address.city_code}}&area_code={{address.area_code}}&city={{address.city}}&area={{address.area}}" hover-class="none" class="cityCont">
+		<navigator
+			url="/pages/switchcity/switchcity?city_code={{address.city_code}}&area_code={{address.area_code}}&city={{address.city}}&area={{address.area}}"
+			hover-class="none" class="cityCont">
 			<view class="nowrap">
 				<text>{{address.city}}{{address.area}}</text>
 			</view>
@@ -27,19 +29,11 @@
 		<!-- 卡片轮播 -->
 		<view class="indexBanner">
 			<view class="banner">
-				<swiper class="banner-swiper" interval="3000" autoplay bindchange="monitorCurrent" current="{{current}}">
+				<swiper class="banner-swiper" interval="3000" autoplay circular current="{{current}}"
-					<swiper-item wx:for="{{adverts}}" wx:key="adverts">
+					bindchange="swiperChange">
-						<image class="banner-img" src="{{item.cover}}" show-menu-by-longpress="true" mode="aspectFill"
-							bindtap="clickImg" data-img="{{item.qrcode}}" data-index="{{index}}">
-						</image>
-						<i class="light"></i>
-					</swiper-item>
-				</swiper>
-
-				<swiper class="banner-swiper" interval="3000" autoplay circular current="{{current}}" bindchange="swiperChange">
 					<swiper-item wx:for="{{adverts}}" wx:key="adverts" bindtap="navigato" data-url="{{item.url}}">
 						<image class="banner-img" src="{{item.cover}}" show-menu-by-longpress="true" mode="aspectFill"
-							bindtap="clickImg" data-img="{{item.qrcode}}" data-index="{{index}}">
+							bindtap="clickImg" data-img="{{item.qrcode}}" data-url="{{item.url}}" data-channel="{{item.channel}}">
 						</image>
 						<i class="light"></i>
 					</swiper-item>
@@ -68,7 +62,8 @@
 			<view class="cardArr-top">
 				<block wx:if="{{cardArr.length > 0}}">
 					<view bindtap="rightNav" wx:for="{{cardArr}}" wx:key="cardArr" class="indexCard"
-						data-id="{{item.right_config_id}}" data-from="{{item.from}}" data-rightid="{{item.right_config_id}}">
+						data-id="{{item.right_config_id}}" data-from="{{item.from}}"
+						data-rightid="{{item.right_config_id}}">
 						<image class="indexCard-img" src="{{item.cover}}"></image>
 						<view class="nowrap indexCard-title">{{item.title}}</view>
 						<view class="nowrap activity-remark" wx:if="{{item.subtitle != null}}">
@@ -86,29 +81,36 @@
 			</view>
 
 			<!-- 福利日 -->
-			<view class="Welfare" wx:if="{{activities.length > 0}}">
+			<view class="WelfareCont" wx:if="{{activities.length > 0}}">
-				<view class="WelfareTitle"><text>周五会员福利日</text></view>
+				<view class="WelfareTop">
-				<view class="WelfareList">
+					<image class="welfare_stra" src="../../static/img/welfare_stra.png"></image>
-					<view class="WelfareList-back" bindtap="Snapup" wx:for="{{activities}}" wx:key="activities"
+					<image class="welfare-title" src="../../static/img/welfare_title.png"></image>
-						data-text="{{item.code_text}}" data-can="{{item.canBuy}}" data-id="{{item.welfare_id}}" data-from="{{item.right.from}}"  data-rightId="{{item.right.right_config_id}}">
+				</view>
-						<image class="WelfareList-img {{item.surplus == 0 ? 'active' : ''}}"
+				<view class="subscribe" bindtap="subscribeTap">点击消息提醒</view>
-							src="/static/img/welfare_back.png"></image>
+				<view class="WelfareTitle"><text>{{ activities.length }}</text> 大会员权益，福利全线升级</view>
-						<view class="WelfareList-left">
+				<view class="WelfareList" bindtap="Snapup" wx:for="{{activities}}" wx:key="activities"
-							<view class="cell">
+					data-text="{{item.code_text}}" data-can="{{item.canBuy}}" data-id="{{item.welfare_id}}"
-								<view class="WelfareList-left-price">{{item.price}}<text> 元</text></view>
+					data-from="{{item.right.from}}" data-rightId="{{item.right.right_config_id}}">
-								<view class="WelfareList-left-title">{{item.title}}</view>
+					<image class="WelfareList-img {{item.surplus == 0 ? 'active' : ''}}"
+						src="{{item.right.from == 'washcar' ? '../../static/img/welfare_back_00.png' : '../../static/img/welfare_back_01.png'}}">
+					</image>
+					<view class="WelfareList-back">
+						<image class="WelfareList-left {{item.surplus == 0 ? 'active' : ''}}"
+							src="{{item.right.from == 'washcar' ? '../../static/img/welfare_icon_00.png' : '../../static/img/welfare_icon_01.png' }}">
+						</image>
+						<view class="WelfareList-center">
+							<view class="nowrap WelfareList-price">{{item.price}}<text> 元</text>（{{item.title}}）</view>
+							<view class="WelfareList-center-cont">
+								<view class="WelfareList-center-all {{item.surplus == 0 ? 'active' : ''}}">
+									<text>[限量{{item.stock}}份]</text> <text>[剩余{{item.surplus}}份]</text>
+								</view>
+								<view class="WelfareList-center-time {{item.surplus == 0 ? 'active' : ''}}">
+									<text>{{item.start_time}} 开抢</text><text>{{item.end_time}} 结束</text>
+								</view>
 							</view>
 						</view>
-						<view class="WelfareList-right">
+						<view class="WelfareList-right {{item.surplus == 0 ? 'active' : ''}}">
-							<view class="WelfareList-cont">
+							<text>抢购</text>
-								<view class="nowrap WelfareList-title">每周五：</view>
-								<view class="nowrap WelfareList-text">{{item.start_time}} 开抢</view>
-								<view class="nowrap WelfareList-text">{{item.end_time}} 结束</view>
-								<view class="nowrap WelfareList-all">[限量{{item.stock}}份] [剩余{{item.surplus}}份]</view>
-							</view>
-						</view>
-						<view class="WelfareList-btn {{item.surplus == 0 ? 'active' : ''}}">
-							<text>抢</text>
 						</view>
 					</view>
 				</view>

pages/index/index.wxss

@@ -113,14 +113,17 @@ page {
 
 /* 权益列表 */
 .cardArr {
-    padding: 40rpx 30rpx 30rpx;
+    padding: 50rpx 0 30rpx;
     box-sizing: border-box;
     overflow: hidden;
 }
 
 .cardArr-top {
+    padding: 0 30rpx;
+    box-sizing: border-box;
     flex-wrap: wrap;
     display: flex;
+    margin-bottom: 20rpx;
 }
 
 .indexCard {
@@ -314,77 +317,159 @@ page {
 }
 
 /* 福利日 */
-
+/* 
 .Welfare {
-    text-align: center;
+    background-color: #000;
-}
+    padding: 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+} */
 
 .WelfareTitle {
-    display: inline-block;
+    width: 100%;
-    background-color: #020202;
+    text-align: center;
-    border-radius: 20rpx 20rpx 10rpx 10rpx;
+    margin-bottom: 30rpx;
-    height: 68rpx;
+    font-size: 32rpx;
-    line-height: 68rpx;
+    font-weight: 600;
-    padding: 0 50rpx;
+    padding-top: 50rpx;
-}
+    color: #f1cb8c;
-
-.WelfareTitle text,
-.WelfareList-btn text {
-    background-image: -webkit-linear-gradient(left, #e4dab7, #d9b672);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
 }
 
 .WelfareTitle text {
-    font-weight: 600;
+    font-size: 64rpx;
-    font-size: 38rpx;
+}
+
+.WelfareCont {
+    background-color: #000;
+    border: #fcf9da 2rpx solid;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx 30rpx 10rpx 10rpx;
+    position: relative;
+}
+
+.WelfareTop {
+    position: absolute;
+    top: -20rpx;
+    left: calc(50% - 225rpx);
+    width: 450rpx;
+    height: 70rpx;
+}
+
+.WelfareTop .welfare-title,
+.WelfareTop .welfare_stra {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100%;
+}
+
+.WelfareTop .welfare_stra {
+    height: 130%;
+    z-index: 2;
+    animation: star .3s ease-in infinite;
+}
+
+@keyframes star {
+    10% {
+        opacity: 0;
+    }
+
+    90% {
+        opacity: 1;
+    }
 }
 
 .WelfareList {
-    background-color: #020202;
-    border-radius: 20rpx;
-    padding: 40rpx 30rpx;
-    box-sizing: border-box;
-    position: relative;
-    overflow: hidden;
-}
-
-.WelfareList::after {
-    position: absolute;
-    content: '';
-    top: -60rpx;
-    right: 0;
-    background-image: -moz-linear-gradient(right, rgba(255, 255, 255, .2), rgba(0, 0, 0, 0));
-    background-image: -webkit-linear-gradient(right, rgba(255, 255, 255, .2), rgba(0, 0, 0, 0));
-    background-image: linear-gradient(right, rgba(255, 255, 255, .2), rgba(0, 0, 0, 0));
-    width: 200rpx;
-    height: 200rpx;
-    border-radius: 50%;
-}
-
-.WelfareList-back {
     position: relative;
     width: 100%;
-    height: 220rpx;
+    padding-top: 35%;
-    padding: 30rpx;
+    margin-bottom: 30rpx;
-    box-sizing: border-box;
-    margin-bottom: 40rpx;
 }
 
-.WelfareList-back:last-child {
+.WelfareList:last-child {
     margin: 0;
 }
 
 .WelfareList-img {
+    border-radius: 15rpx;
+    overflow: hidden;
     position: absolute;
     left: 0;
     top: 0;
     width: 100%;
     height: 100%;
-    z-index: 1;
 }
 
-.WelfareList-img.active {
+
+.WelfareList-back {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    padding: 45rpx 40rpx;
+    box-sizing: border-box;
+    z-index: 8;
+    display: flex;
+}
+
+.WelfareList-left {
+    width: 70rpx;
+    height: 70rpx;
+    margin-top: 6%;
+}
+
+.WelfareList-center {
+    font-size: 24rpx;
+    margin-left: 30rpx;
+    width: calc(100% - 100rpx);
+}
+
+.WelfareList-price {
+    font-size: 30rpx;
+    font-weight: 600;
+}
+
+.WelfareList-center-cont {
+    padding-right: 100rpx;
+    box-sizing: border-box;
+}
+
+.WelfareList-center-all {
+    margin: 10rpx 0;
+    color: #633c1b;
+    font-weight: 600;
+}
+
+.WelfareList-right {
+    background: linear-gradient(to bottom, #e8b86d, #9d743e);
+    -webkit-background-size: 200% 100%;
+    -webkit-animation: masked-animation 2s infinite linear;
+    color: #fff;
+    height: 58rpx;
+    line-height: 58rpx;
+    font-size: 28rpx;
+    width: 120rpx;
+    text-align: center;
+    border-radius: 40rpx;
+    margin-top: 7%;
+    position: absolute;
+    right: 40rpx;
+    top: 60rpx;
+}
+@-webkit-keyframes masked-animation {
+    0%  { background-position: 0 0;}
+    100% { background-position: -100% 0;}
+}
+
+.WelfareList-right.active {
+    background: linear-gradient(to bottom, #969696, #969696);
+}
+
+.WelfareList-img.active,
+.WelfareList-left.active {
     -webkit-filter: grayscale(100%);
     -moz-filter: grayscale(100%);
     -ms-filter: grayscale(100%);
@@ -393,120 +478,63 @@ page {
     filter: gray;
 }
 
-.WelfareList-left,
+.WelfareList-center-time.active,
-.WelfareList-right,
+.WelfareList-center-all.active {
-.WelfareList-btn {
+    color: #929292;
-    position: absolute;
-    z-index: 2;
-    left: 0;
 }
 
-.WelfareList-left {
+.WelfareList-center-time.active::after {
-    top: -4rpx;
+    background-color: #cccccc;
-    width: 180rpx;
-    font-weight: 600;
-    display:table;
-    height: 226rpx;
 }
 
-.cell {
+.WelfareList-right text {
-    display:table-cell;
+    display: inline-block;
-    vertical-align:middle;
+    animation:mymove 2s infinite;
+    transform: scale(.9);
 }
 
-.WelfareList-left-title {
+@keyframes mymove{
-    font-size: 28rpx;
+    0%{
-    word-break:normal;
+        transform: scale(.9);
-    padding: 0 30rpx;
+    }
-    box-sizing: border-box;
+    25%{
+        transform: scale(1);
+    }
+    50%{
+        transform: scale(.9);
+    }
+    75%{
+        transform: scale(1);
+    }
 }
 
-.WelfareList-left .WelfareList-left-price {
+.WelfareList-right.active text {
-    font-size: 40rpx;
+    -webkit-animation: mymove 0s infinite linear;
 }
 
-.WelfareList-left text {
+.WelfareList-center-time {
-    font-size: 28rpx;
+    position: relative;
-    font-weight: 600;
+    padding-top: 25rpx;
+    color: #a37d4d;
 }
 
-.WelfareList-right {
+.WelfareList-center-time::after {
-    line-height: 44rpx;
-    width: 100%;
-    padding-left: 200rpx;
-    padding-right: 160rpx;
-    box-sizing: border-box;
-    text-align: left;
-    display: flex;
-}
-
-.WelfareList-cont {
-    width: 100%;
-    margin-top: -8rpx;
-}
-
-.WelfareList-btn {
-    left: auto;
-    top: 55rpx;
-    right: 30rpx;
-    background-color: #020202;
-    width: 110rpx;
-    height: 110rpx;
-    text-align: center;
-    line-height: 110rpx;
-    border-radius: 50%;
-    overflow: hidden;
-}
-
-.WelfareList-btn::after {
     position: absolute;
     content: '';
-    top: -50rpx;
     left: 0;
-    background-image: -moz-linear-gradient(right, rgba(255, 255, 255, .25), rgba(0, 0, 0, 0));
+    top: 0;
-    background-image: -webkit-linear-gradient(right, rgba(255, 255, 255, .25), rgba(0, 0, 0, 0));
+    width: 60rpx;
-    background-image: linear-gradient(right, rgba(255, 255, 255, .25), rgba(0, 0, 0, 0));
+    height: 6rpx;
-    width: 100rpx;
+    border-radius: 20rpx;
-    height: 100rpx;
+    background-color: #d68f0d;
-    border-radius: 50%;
 }
 
-.WelfareList-btn.active {
+.WelfareList-center-time text,
-    background-color: #9c9c9c;
+.WelfareList-center-all text {
-}
+    padding-right: 20rpx;
-
-.WelfareList-btn.active::before {
-    position: absolute;
-    content: '';
-    width: 100%;
-    height: 4rpx;
-    background-color: #cecece;
-    left: 0;
-    top: 50%;
-    transform:rotate(45deg);
-}
-
-.WelfareList-btn.active text {
-    background-image: -moz-linear-gradient(#c3c3c3);
-    background-image: -webkit-linear-gradient(#c3c3c3);
-    background-image: linear-gradient(#c3c3c3);
-    -webkit-text-fill-color: #c3c3c3;
-}
-
-
-.WelfareList-btn text {
-    font-weight: 600;
-    font-size: 54rpx;
-}
-
-.WelfareList-all {
-    font-size: 24rpx;
-}
-
-.WelfareList-text {
-    font-size: 28rpx;
 }
 
+/* 光 */
 .light {
     cursor: pointer;
     position: absolute;
@@ -541,4 +569,9 @@ page {
         left: 100%;
         background: rgba(255, 255, 255, 0);
     }
+}
+
+/* 订阅消息 */
+.subscribe {
+    color: #fff;
 }

pages/makeForm/makeForm.js

@@ -0,0 +1,126 @@
+/*
+ * 本时生活
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        businessId: '',  // 业务收集携带参数-接收id
+        checkedId : '',  // 选择生效时间样式
+        makeTime  : [],  // 业务收集-生效时间数据
+        makeData  : '',  // 业务收集数据,
+        disabled  : false, //预约按钮状态
+        makeItems : [],  //业务手机套餐列表
+        itemsId   : ''    //业务手机套餐列表id
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad (options) {
+        console.log(options)
+        this.setData({
+            businessId: options.business_id
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow () {
+        // 获取业务收集数据
+        this.makeInfo();
+    },
+    
+    /**
+     * 业务收集数据
+     */
+    makeInfo() {
+        wx.$api.index.busineSee(this.data.businessId).then(res=>{
+            console.log(res.data)
+            res.data.type[0].checked = true
+            this.setData({
+                businessId: res.data.business_id,
+                makeData  : res.data,
+                makeTime  : res.data.type,
+                makeItems : res.data.items,
+                checkedId : res.data.type[0].id,
+                itemsId   : res.data.items[0].business_item_id,
+            })
+        }).catch(err=>{
+            if(!err.login){
+                wx.showModal({
+                    title       : '用户登录已过期',
+                    content     : '请重新登录',
+                    showCancel  : false,
+                    success : res => {
+                      if (res.confirm) {
+                        wx.redirectTo({
+                          url: '/pages/login/login'
+                        })
+                      }
+                    }
+                })
+            }
+        })
+    },
+
+    /**
+     * 生效时间选择
+     */
+    radioChange(e) {
+        this.setData({
+            checkedId: e.detail.value
+        })
+    },
+
+    /**
+     * 套餐列表选择
+     */
+    makeTap(e) {
+        this.setData({
+            itemsId: e.currentTarget.dataset.id
+        })
+    },
+
+    /**
+     * 预约表单
+     */
+    formSubmit(e) {
+        let newMobile   = e.detail.value.mobile,
+            newUsername = e.detail.value.username,
+            business_id = this.data.businessId,
+            checked_id  = this.data.checkedId,
+            items_id    = this.data.itemsId
+       wx.$api.index.busineForm(business_id, items_id, checked_id, newMobile, newUsername).then(res=>{
+            this.setData({
+                disabled: true
+            })
+            wx.showToast({
+                title: '预约成功',
+                icon: 'success'
+            })
+            setTimeout(function () {
+                wx.navigateBack({
+                    delta: 1
+                })
+            }, 2000)
+        }).catch(err=>{
+            if(!err.login){
+                
+            }
+        })
+    },
+
+    /**
+     * 拨打客服电话
+     */
+    makeOneTel() {
+        wx.makePhoneCall({
+            phoneNumber: this.data.makeData.mobile
+        })
+    }
+})

pages/makeForm/makeForm.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "预约表单",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#2a211e"
+}

pages/makeForm/makeForm.wxml

@@ -0,0 +1,73 @@
+<!-- 标题 -->
+<view class="makeTitle">
+    <image src="/static/img/makeForm_title_00.png" mode="widthFix"></image>
+    <view class="makeTitle-text">
+        {{makeData.name}}
+    </view>
+</view>
+
+<view class="makeCont">
+    <view class="makeOne">
+        <image class="makeOne-img" src="/static/img/makeForm_title_01.png"></image>
+        <view class="makeOne-cont">
+            <view class="makeTwo-title">
+                * 请选择权益生效时间
+            </view>
+            <radio-group name="radio" bindchange="radioChange">
+                <label class="makeOne-label {{checkedId == item.id ? 'active' : ''}}" wx:for="{{makeTime}}" wx:key="makeTime">
+                    <text>{{item.name}}生效</text>
+                    <radio value="{{item.id}}" checked="{{item.checked}}" />
+                </label>
+            </radio-group>
+        </view>
+    </view>
+    <view class="makeTwo">
+        <view class="makeTwo-img">
+            <image src="/static/img/makeForm_title_02.png"></image>
+            <text>权益套餐列表</text>
+        </view>
+        <view class="makeOne-cont">
+            <view class="makeTwo-title">
+                * 请选择权益套餐
+            </view>
+            <view class="makeTwo-list">
+                <view class="makeTwo-label {{itemsId == item.business_item_id ? 'active':''}}" wx:for="{{makeItems}}" wx:key="makeItems" data-id="{{item.business_item_id}}" bindtap="makeTap">
+                    <view class="makeTwo-left">
+                        <image class="makeTwo-left-img" src="{{itemsId == item.business_item_id ? '/static/img/makeForm_price_back_active.png':'/static/img/makeForm_price_back.png'}}"></image>
+                        <view class="makeTwo-left-cont {{itemsId == item.business_item_id ? 'active':''}}">
+                            <view class="makeTwo-left-tips">畅享套餐</view>
+                            <view class="makeTwo-left-price"><text>{{item.name}}</text>元</view>
+                        </view>
+                    </view>
+                    <view class="makeTwo-right {{itemsId == item.business_item_id ? 'active':''}}">
+                        <view class="makeTwo-right-title">{{item.remark}}</view>
+                        <view class="makeTwo-right-text">大流量 享权益 超值优惠</view>
+                    </view>
+                    <view class="makeTwo-checked {{itemsId == item.business_item_id ? 'active':''}}">
+                        <image src="/static/img/makeForm_checked.png"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="makeTwo">
+        <view class="makeTwo-img">
+            <image src="/static/img/makeForm_title_02.png"></image>
+            <text>用户预留信息</text>
+        </view>
+        <view class="makeOne-cont">
+            <view class="makeTwo-title">
+                * 请填写预留信息
+            </view>
+            <view class="makeForm">
+                <form bindsubmit="formSubmit">
+                    <input type="text" name="username" placeholder="请输入姓名" />
+                    <input type="number" name="mobile" placeholder="请输入手机号" />
+                    <button formType="submit" disabled="{{disabled}}">立即预约</button>
+                </form>
+            </view>
+        </view>
+    </view>
+
+    <view class="makeOne-tel">客服热线：{{makeData.mobile}}<view class="makeOne-tel-btn" bindtap="makeOneTel">拨打客服电话</view></view>
+</view>

pages/makeForm/makeForm.wxss

@@ -0,0 +1,303 @@
+page {
+    background-color: #2a211e;
+}
+
+/* 标题 */
+.makeTitle {
+    text-align: center;
+    position: relative;
+    width: 100%;
+}
+
+.makeTitle-text {
+    width: 100%;
+    line-height: 300rpx;
+    top: 25%;
+    font-style:italic;
+    left: 0;
+    font-size: 80rpx;
+    font-weight: 600;
+    position: absolute;
+    text-align: center;
+    background-image:-webkit-linear-gradient(top,#fff0ea,#f5baa2,#982d00);
+    -webkit-background-clip:text;
+    -webkit-text-fill-color:transparent;
+}
+
+.makeTitle image {
+    width: 100%;
+}
+
+/* 内容 */
+.makeCont {
+    width: 100%;
+    padding: 20rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.makeOne {
+    text-align: center;
+}
+
+.makeOne-img {
+    width: 320rpx;
+    height: 100rpx;
+    display: block;
+    margin: 0 auto;
+}
+
+.makeOne-cont {
+    width: 100%;
+    text-align: left;
+    background-color: #fff;
+    border: 22rpx #ffc3a9 solid;
+    border-radius: 10rpx;
+    padding: 30rpx 0 30rpx 10rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+.makeOne-label {
+    border: 2rpx solid #dadada;
+    width: calc(50% - 34rpx);
+    border-radius: 10rpx;
+    height: 76rpx;
+    line-height: 70rpx;
+    padding: 0 15rpx;
+    box-sizing: border-box;
+    margin: 0 15rpx;
+    float: left;
+    display: flex;
+    font-size: 28rpx;
+}
+
+.makeOne-label.active {
+    border-color: #cf211c;
+    color: #cf211c;
+}
+
+.makeOne-label text {
+    flex: 1;
+    display: inline-block;
+}
+
+.makeOne-label radio {
+    transform:scale(.7);
+}
+
+radio .wx-radio-input.wx-radio-input-checked {
+    border-color: #cf211c !important;
+    background : #cf211c !important;
+}
+
+/* 列表 */
+.makeTwo {
+    margin: 50rpx 0;
+}
+
+.makeTwo-img {
+    width: 320rpx;
+    height: 140rpx;
+    position: relative;
+    text-align: center;
+    margin: 0 auto;
+}
+
+.makeTwo-img image {
+    width: 100%;
+    height: 100%;
+    display: block;
+}
+
+.makeTwo-img text {
+    position: absolute;
+    width: 100%;
+    color: #2a211e;
+    left: 0;
+    top: 36rpx;
+    font-weight: 600;
+    font-size: 30rpx;
+}
+
+.makeTwo-title {
+    padding: 0 20rpx;
+    font-size: 28rpx;
+    color: #982e00;
+    font-weight: 600;
+    margin-bottom: 30rpx;
+}
+
+.makeTwo-list {
+    width: 100%;
+    padding: 0 15rpx;
+    box-sizing: border-box;
+}
+
+.makeTwo-label {
+    margin-bottom: 30rpx;
+    background-color: #efefef;
+    padding: 20rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    display: flex;
+    position: relative;
+}
+
+.makeTwo-label::after {
+    position: absolute;
+    border-radius: 10rpx;
+    content: '';
+    width: calc(100% - 20rpx);
+    left: 8rpx;
+    top: 8rpx;
+    height: calc(100% - 20rpx);
+    border: 2rpx solid #dadada;
+}
+
+.makeTwo-label.active {
+    background: #fff6e1;
+}
+
+.makeTwo-label.active::after {
+    border-color: #f9cc7e;
+}
+
+.makeTwo-label:last-child {
+    margin: 0;
+}
+
+.makeTwo-left {
+    position: relative;
+    width: 140rpx;
+    height: 110rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.makeTwo-left-img,
+.makeTwo-left-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.makeTwo-left-cont {
+    z-index: 2;
+    text-align: center;
+    color: #7e7e7e;
+}
+
+.makeTwo-left-cont.active {
+    color: #d79300;
+}
+
+.makeTwo-left-tips {
+    margin: 10rpx 0 5rpx;
+    font-size: 24rpx;
+}
+
+.makeTwo-left-price {
+    font-size: 24rpx;
+}
+
+.makeTwo-left-price text {
+    font-size: 42rpx;
+    padding-right: 10rpx;
+    font-weight: 600;
+}
+
+.makeTwo-right {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: 30rpx;
+    padding-left: 180rpx;
+    box-sizing: border-box;
+    font-size: 26rpx;
+}
+
+.makeTwo-right-title,
+.makeTwo-right-text {
+    color: #7e7e7e;
+}
+
+.makeTwo-right-title {
+    font-size: 30rpx;
+    font-weight: 600;
+    margin-bottom: 15rpx;
+}
+
+.makeTwo-right.active .makeTwo-right-title {
+    color: #df3f28;
+}
+
+.makeTwo-right.active .makeTwo-right-text {
+    color: #a45b0e;
+}
+
+.makeTwo-checked {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 40rpx;
+    height: 40rpx;
+    z-index: 2;
+    display: none;
+}
+
+.makeTwo-checked image {
+    width: 100%;
+    height: 100%;
+}
+
+.makeTwo-checked.active {
+    display: block;
+}
+
+
+.makeForm {
+    padding: 0 20rpx;
+    box-sizing: border-box;
+}
+
+.makeForm input {
+    border: none;
+    background-color: #ececec;
+    border-radius: 50rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    height: 80rpx;
+    line-height: 80rpx;
+    display: block;
+    margin-bottom: 30rpx;
+    font-size: 28rpx;
+}
+
+.makeForm button {
+    display: block;
+    margin-top: 40rpx;
+    border: none;
+    font-size: 30rpx;
+    border-radius: 50rpx;
+    width: 100% !important;
+    padding: 0;
+    height: 80rpx;
+    line-height: 80rpx;
+    background: linear-gradient(to left, #fd664d, #f28c29);
+    color: #fff;
+}
+
+.makeOne-tel {
+    width: 100%;
+    text-align: center;
+    color: #fff;
+    font-size: 28rpx;
+    margin-bottom: 30rpx;
+}
+
+.makeOne-tel-btn {
+    color: #ffa751;
+    margin-top: 20rpx;
+}

pages/welfare/welfare.js

@@ -21,6 +21,7 @@ Page({
         platformCp      : [],    //选择提交数组
         platIndex       : 0,     //选择提交方式下标
         payWayIndex     : 0,     //选择支付方式下标
+        subscribeTips   : '',    //订阅--临时舍去
         payWay          :[
             {value: 0, name: "微信支付"}
             // {value: 1, name: "沃钱包支付"}
@@ -271,5 +272,22 @@ Page({
                 }
             }
         })
-    }
+    },
+
+    /**
+     * 订阅--临时舍去
+     */
+    // subscribeTap() {
+    //     wx.$api.index.subscribe(this.data.contData.welfare_id).then(res=>{
+    //         wx.showLoading({
+    //             title: res.data,
+    //             icon : 'none',
+    //         })
+    //         setTimeout(function () {
+    //             wx.hideLoading();
+    //         }, 1000)
+    //     }).catch(err=>{
+            
+    //     })
+    // }
 })

pages/welfare/welfare.wxml

@@ -150,4 +150,9 @@
 			<view class="address-tool-icon">选择地址</view>
 		</view>
 	</scroll-view>
-</view>
+</view>
+
+<!-- 订阅--临时舍去 -->
+<!-- <view class="subscribe" bindtap="subscribeTap">
+    <image src="/static/img/subscribe.png"></image>
+</view> -->

pages/welfare/welfare.wxss

@@ -564,4 +564,53 @@
 
 .webBack.active {
     display: block;
+}
+
+.subscribe {
+    position: fixed;
+    bottom: 400rpx;
+    right: 20rpx;
+    z-index: 999;
+    width: 100rpx;
+    height: 100rpx;
+    -webkit-animation: Tada 3s both infinite;
+    -moz-animation: Tada 3s both infinite;
+    -ms-animation: Tada 3s both infinite;
+    animation: Tada 3s both infinite;
+}
+
+.subscribe.active {
+    display: none;
+}
+
+@keyframes Tada {
+    0% {
+        transform: scale(1);
+        transform: scale(1)
+    }
+
+    70%,73%{
+        transform: scale(1) rotate(-3deg);
+        transform: scale(1) rotate(-3deg)
+    }
+
+    77%,83%,90%,97%  {
+        transform: scale(1) rotate(3deg);
+        transform: scale(1) rotate(3deg)
+    }
+
+    80%,87%,93%{
+        transform: scale(1) rotate(-3deg);
+        transform: scale(1) rotate(-3deg)
+    }
+
+    100% {
+        transform: scale(1) rotate(0);
+        transform: scale(1) rotate(0)
+    }
+}
+
+.subscribe image {
+    width: 100%;
+    height: 100%;
 }

project.private.config.json

@@ -96,6 +96,17 @@
                     "pathName": "pages/order/order",
                     "query": "",
                     "scene": null
+                },
+                {
+                    "name": "pages/frozen/frozen",
+                    "pathName": "pages/frozen/frozen",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/makeForm/makeForm",
+                    "pathName": "pages/makeForm/makeForm",
+                    "scene": null
                 }
             ]
         }