From b555234d4974b8cf24ee50a4340c58aa6046635d Mon Sep 17 00:00:00 2001
From: zhangjing <994797151@qq.com>
Date: Thu, 24 Jun 2021 14:15:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/interfaces/user.js            |   2 +-
 pages/account/account.js          |  23 ++-
 pages/account/account.wxml        |  13 +-
 pages/account/account.wxss        |  46 +++++-
 pages/frozen/frozen.js            |  16 +-
 pages/frozen/frozen.wxml          | 258 ++++++++----------------------
 pages/frozen/frozen.wxss          |  65 ++++++--
 pages/index/index.js              |   2 +-
 pages/makeForm/makeForm.js        |   6 +-
 pages/makeForm/makeForm.wxml      |   2 +-
 static/img/frozen_identity.png    | Bin 17533 -> 0 bytes
 static/img/frozen_identity_00.png | Bin 0 -> 2306 bytes
 static/img/frozen_identity_01.png | Bin 0 -> 2421 bytes
 13 files changed, 204 insertions(+), 229 deletions(-)
 delete mode 100644 static/img/frozen_identity.png
 create mode 100644 static/img/frozen_identity_00.png
 create mode 100644 static/img/frozen_identity_01.png

diff --git a/api/interfaces/user.js b/api/interfaces/user.js
index c894ccd..5c9cf81 100644
--- a/api/interfaces/user.js
+++ b/api/interfaces/user.js
@@ -41,7 +41,7 @@ const cards = (code, pass) => req({url: "user/cards/activate", method: "POST", d
 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}})
+const ungrants = (type,) => req({url: "account/newungrants", data:{type : type}})
 
 // 发送短信
 const send = (mobile, channel, type) => req({url: "sms/send", method: "POST", data:{mobile : mobile, channel : channel, type : type}})
diff --git a/pages/account/account.js b/pages/account/account.js
index 204bb7b..72bf728 100644
--- a/pages/account/account.js
+++ b/pages/account/account.js
@@ -11,7 +11,7 @@ Page({
         blockeds    : '',       //待发放余额
         page        : {},       //分页信息
         lodingStats : false,    //加载状态
-        screenArray: [
+        screenArray : [
             {
                 channel: 'all',
                 name: '全部'
@@ -24,8 +24,9 @@ Page({
                 channel: 'out',
                 name: '出账'
             }
-        ],                   //账变记录筛选数组
-        screenIndex: 0       //账变记录筛选index
+        ],                      //账变记录筛选数组
+        screenChannel: '',  //账变记录筛选数组标识
+        screenIndex  : 0       //账变记录筛选index
     },
 
     /**
@@ -38,6 +39,7 @@ Page({
     },
 
     onShow() {
+        console.log(this.data.screenChannel)
         // 获取账变记录
         this.accountInfo();
     },
@@ -46,7 +48,7 @@ Page({
      * 账变记录
      */
     accountInfo(page) {
-        wx.$api.user.logs(this.data.type, page).then(res=>{
+        wx.$api.user.logs(this.data.type, this.data.screenChannel, page).then(res=>{
             //判断金卡、银卡、钻石卡
             let number
             if(this.data.type == "silver") {
@@ -73,6 +75,19 @@ Page({
         })
     },
 
+    /**
+     * 筛选账变记录-条件
+     */
+    screenBind(e) {
+        this.setData({
+            screenIndex  : e.detail.value,
+            screenChannel: this.data.screenArray[e.detail.value].channel
+        })
+
+        // 获取账变记录
+        this.accountInfo();
+    },
+
     /**
      * 页面相关事件处理函数--监听用户下拉动作
      */
diff --git a/pages/account/account.wxml b/pages/account/account.wxml
index 1b5aa9d..d6f5909 100644
--- a/pages/account/account.wxml
+++ b/pages/account/account.wxml
@@ -23,7 +23,7 @@
 	<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}}">
+			<picker bindchange="screenBind" value="{{screenIndex}}" range-key="name" range="{{screenArray}}">
 				{{screenArray[screenIndex].name}}
 			</picker>
 			<image class="integra-cont-icon" src="/static/icon/arrow_down.png"></image>
@@ -33,16 +33,19 @@
 	<view class="integra-list" wx:for="{{accounts}}" wx:key="integras">
 		<view class="integra-text">
 			<view class="integra-title">
-				{{item.title}}
+				<view class="integra-title-tips {{item.channel == 'in' ? 'active' : ''}}">{{item.channel == 'in' ? '入' : '出'}}</view>{{item.title}}
 			</view>
-			<view class="integra-oints">
+			<view class="integra-oints {{item.channel == 'in' ? 'active' : ''}}">
 				{{item.variable}}
 			</view>
 		</view>
+		<view class="integra-remark">
+			{{item.remark}}
+		</view>
 		<view class="integra-date">
 			<view class="integra-time">
-				<text>有效期：</text>
-				{{item.created_at}} 至 {{item.expired_at}}
+				<text>{{item.channel == 'in' ? '有效期：' : '扣除时间：'}}</text>
+				{{item.created_at}}{{item.channel == 'in' ? ' 至 ' + item.expired_at : ''}}
 			</view>
 			<!-- <view class="integra-time">
 				<text>到期时间：</text>
diff --git a/pages/account/account.wxss b/pages/account/account.wxss
index b7a103f..e8e90e2 100644
--- a/pages/account/account.wxss
+++ b/pages/account/account.wxss
@@ -43,6 +43,24 @@
 
 .integra-title {
     margin-bottom: 20rpx;
+    display: flex;
+}
+
+.integra-title-tips {
+    background-color: green;
+    color: #fff;
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 38rpx;
+    text-align: center;
+    border-radius: 50%;
+    margin-right: 10rpx;
+    font-size: 24rpx;
+    transform: scale(0.8);
+}
+
+.integra-title-tips.active {
+    background-color: red;
 }
 
 .integra-number {
@@ -136,23 +154,39 @@
     margin-bottom: 20rpx;
 }
 
-.integra-title {
+.integra-list .integra-title {
     flex: 1;
     font-size: 30rpx;
     display: flex;
+    margin: 0;
 }
 
-.integra-title text {
+/* .integra-title text {
     flex: 1;
-}
+} */
 
 .integra-title image {
     width: 36rpx;
     height: 36rpx;
+    margin: 4rpx 0 0 10rpx;
 }
 
 .integra-oints {
-    color: #f0a479;
+    color: green;
+}
+
+.integra-oints.active {
+    color: red;
+}
+
+.integra-remark {
+    margin-bottom: 20rpx;
+    font-size: 26rpx;
+    color: #4e4e4e;
+    background: #f5f5f5;
+    display: inline-block;
+    padding: 6rpx 20rpx;
+    border-radius: 50rpx;
 }
 
 .integra-date {
@@ -168,6 +202,6 @@
     font-size: 28rpx;
 }
 
-.integra-time text {
+/* .integra-time text {
     color: #000;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/pages/frozen/frozen.js b/pages/frozen/frozen.js
index 03f9de4..3ff161e 100644
--- a/pages/frozen/frozen.js
+++ b/pages/frozen/frozen.js
@@ -10,10 +10,10 @@ Page({
      * 页面的初始数据
      */
     data: {
-        current     : 0,  //轮播标
-        type        : '', //类型
-        frozenData  : [], //数组列表
-        blockeds    : '', //待发放金额
+        current      : 0,  //轮播标
+        type         : '', //类型
+        frozenData   : [], //数组列表
+        blockeds     : '', //待发放金额
     },
 
     /**
@@ -33,9 +33,17 @@ Page({
      */
     frozenInfo() {
         wx.$api.user.ungrants(this.data.type).then(res=>{
+            console.log(res)
             this.setData({
                 frozenData: res.data
             })
         })
+    },
+
+    // 轮播滑动
+    monitorCurrent(e) {
+        this.setData({
+            current: e.detail.current
+        })
     }
 })
\ No newline at end of file
diff --git a/pages/frozen/frozen.wxml b/pages/frozen/frozen.wxml
index 8163a06..84e34b0 100644
--- a/pages/frozen/frozen.wxml
+++ b/pages/frozen/frozen.wxml
@@ -28,205 +28,87 @@
 </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 wx:if="{{frozenData.length > 0}}">
+    <view class="grantSwiper">
+        <swiper class="banner-swiper" bindchange="monitorCurrent" current="{{current}}">
+            <swiper-item bindtap="userUrl" wx:for="{{frozenData}}" wx:key="frozenData">
+                <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_00.png"></image>
+                            <view class="grantTop-price">
+                                <text>待发放(额度)</text>
+                                <view class="grantTop-price-tips">￥</view>{{item.ungrant}}
+                            </view>
+                        </view>
+                        <view class="grantTop-tips">
+                            <view class="grantTop-time">发放周期 {{item.cycle}}</view>
+                            <view class="grantTop-number">共{{item.num}}期</view>
                         </view>
                     </view>
-                    <view class="grantTop-tips">
-                        <view class="grantTop-time">发放周期 2021.06.22 ~ 2022.06.22</view>
-                        <view class="grantTop-number">共0期</view>
+                    <view class="grantTitle">
+                        <view class="nowrap grantTitle-name">{{item.source.remark}}</view>
+                        <view class="grantTitle-tel">{{item.mobile}}</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 class="grantIssue">
+                    <view class="grantIssue-title">
+                        <view class="grantIssue-title-name">
+                            <image src="/static/img/frozen_icon.png"></image><text>消费红包分期发放</text>
                         </view>
-                        <image class="grantIssue-label-tips" src="/static/img/frozen_btn.png" mode="scaleToFill">
-                        </image>
+                        <view class="grantIssue-title-tips">应发余额<text>￥{{item.variable}}</text>，发放期数<text> {{item.num}}
+                            </text>期，每期发放<text>￥{{item.avg}}/期</text></view>
                     </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 class="grantIssue-list">
+                        <view class="grantIssue-label" wx:for="{{item.items}}" wx:for-item="listItem" wx:key="items">
+                            <image class="grantIssue-label-img {{listItem.status == 0 ? 'active' : ''}}"
+                                src="/static/img/frozen_img.png" mode="scaleToFill"></image>
+                            <view class="grantIssue-label-cont">
+                                <view class="grantIssue-label-left">
+                                    <view class="grantIssue-left-top {{listItem.status == 0 ? 'active' : ''}}">
+                                        第<text>{{listItem.num}}</text>期</view>
+                                    <view class="grantIssue-left-number {{listItem.status == 0 ? 'active' : ''}}">
+                                        共<text>{{item.items.length}}</text>期</view>
+                                </view>
+                                <view class="grantIssue-label-center">
+                                    <view class="grantIssue-center-top {{listItem.status == 0 ? 'active' : ''}}">
+                                        <text>{{listItem.variable}}</text>( 发放额度 )</view>
+                                    <view class="grantIssue-center-time">发放时间：{{listItem.start_at}}</view>
+                                </view>
+                                <view class="grantIssue-label-right {{listItem.status == 0 ? 'active' : ''}}">
+                                    {{listItem.status_text}}
+                                </view>
                             </view>
+                            <image class="grantIssue-label-tips {{listItem.status == 0 ? 'active' : ''}}"
+                                src="/static/img/frozen_btn.png" mode="scaleToFill">
+                            </image>
                         </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>
-        向右滑动
+            </swiper-item>
+        </swiper>
     </view>
-    <view class="frozenArrow-right">
-        <image src="/static/icon/frozen_arrow.png"></image>
-        向左滑动
+
+    <view class="frozenArrow">
+        <view class="frozenArrow-left" wx:if="{{current != 0}}">
+            <image src="/static/icon/frozen_arrow.png"></image>
+            返回上一个权益
+        </view>
+        <view class="frozenArrow-right" wx:if="{{frozenData.length > 1}}">
+            <image src="/static/icon/frozen_arrow.png"></image>
+            查看下一个权益
+        </view>
+    </view>
+
+    <!-- 自定义轮播图进度点 -->
+    <view class="dots">
+        <block wx:for="{{frozenData}}" wx:key="frozenData">
+            <view class='{{index == current ? "active":""}}'></view>
+        </block>
     </view>
 </view>
-
-<!-- 自定义轮播图进度点 -->
-<view class="dots">
-    <!-- wx:for="{{adverts}}" wx:key="cardBanner" -->
-    <block>
-        <view class='{{index == swiperCurrent ? "active":""}}'></view>
-    </block>
+<!-- 暂无内容 -->
+<view class="pack-center pages-hint" wx:else>
+    <view>抱歉，目前暂无内容~</view>
 </view>
\ No newline at end of file
diff --git a/pages/frozen/frozen.wxss b/pages/frozen/frozen.wxss
index f8efa5a..db4d449 100644
--- a/pages/frozen/frozen.wxss
+++ b/pages/frozen/frozen.wxss
@@ -102,18 +102,29 @@
 
 
 /* 最新样式  2021-06-22 */
-page {
+page,
+.pack-center {
     background-image: linear-gradient(to bottom, #24315d, #24315d);
 }
 
+.pack-center {
+    color: #fff;
+}
+
 .banner-swiper {
     height: 100vh;
+    overflow: hidden;
+}
+
+.banner-swiper swiper-item {
+    padding: 0 20rpx;
+    box-sizing: border-box;
 }
 
 .grantSwiper {
     width: 100%;
     height: 100vh;
-    padding: 0 80rpx;
+    padding: 0 40rpx;
     box-sizing: border-box;
 }
 
@@ -167,13 +178,18 @@ page {
     color: #fff;
 }
 
+.grantTop-price-tips {
+    display: inline-block;
+    font-size: 40rpx;
+}
+
 .grantTop-tips {
     bottom: 0;
     font-size: 26rpx;
     display: flex;
     line-height: 70rpx;
     height: 70rpx;
-    padding: 0 40rpx;
+    padding: 0 20rpx;
     box-sizing: border-box;
 }
 
@@ -197,11 +213,11 @@ page {
     box-sizing: border-box;
     height: 90rpx;
     line-height: 90rpx;
-    font-size: 32rpx;
+    font-size: 30rpx;
 }
 
 .grantTitle-name {
-    padding-left: 30rpx;
+    padding-left: 20rpx;
     font-weight: 600;
     background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
     -webkit-background-clip:text;
@@ -237,14 +253,14 @@ page {
 }
 
 .grantIssue-title-name image {
-    width: 44rpx;
-    height: 44rpx;
+    width: 42rpx;
+    height: 42rpx;
     margin-right: 20rpx;
 }
 
 .grantIssue-title-name text {
     font-weight: 600;
-    font-size: 34rpx;
+    font-size: 32rpx;
     background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
     -webkit-background-clip:text;
     -webkit-text-fill-color:transparent;
@@ -290,6 +306,16 @@ page {
     left: 0;
 }
 
+.grantIssue-label-img.active,
+.grantIssue-label-tips.active {
+    -webkit-filter: grayscale(100%);   
+    -moz-filter: grayscale(100%);  
+    -ms-filter: grayscale(100%);   
+    -o-filter: grayscale(100%);     
+    filter: grayscale(100%); 	     
+    filter: gray;
+}
+
 .grantIssue-label-cont {
     position: absolute;
     width: 100%;
@@ -312,6 +338,17 @@ page {
     font-size: 26rpx;
 }
 
+.grantIssue-left-top.active,
+.grantIssue-center-top.active,
+.grantIssue-label-right.active {
+    color: gray;
+}
+
+.grantIssue-left-number.active {
+    background: -webkit-linear-gradient(left,#e2e2e2,#e2e2e2);
+    color: gray;
+}
+
 .grantIssue-left-top text {
     font-size: 34rpx;
     font-weight: 600;
@@ -331,16 +368,16 @@ page {
 }
 
 .grantIssue-label-right {
-    width: 90rpx;
+    width: 80rpx;
     font-weight: 600;
     text-align: center;
-    font-size: 30rpx;
+    font-size: 26rpx;
     color: #3d2a26;
     line-height: 140rpx;
 }
 
 .grantIssue-label-center {
-    width: calc(100% - 250rpx);
+    width: calc(100% - 240rpx);
     margin: 20rpx 20rpx 0 20rpx;
 }
 
@@ -391,13 +428,13 @@ page {
 }
 
 .frozenArrow-left {
-    left: 10rpx;
+    left: 8rpx;
     -webkit-animation: bounce-left 1s linear infinite;
     animation: bounce-left 1s linear infinite;
 }
 
 .frozenArrow-right {
-    right: 10rpx;
+    right: 8rpx;
     -webkit-animation: bounce-right 1s linear infinite;
     animation: bounce-right 1s linear infinite;
 }
@@ -443,5 +480,5 @@ page {
 .dots .active {
     width: 24rpx;
     border-radius: 40rpx;
-    background-color: #f46851;
+    background-color: #b13509;
 }
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 71ab954..b44e99d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -20,7 +20,7 @@ Page({
         longitude       : 0,      //经度
         latitude        : 0,      //纬度
         adverts         : [],     //轮播图
-        stateType       : "shaky",
+        stateType       : "silver",
         cardArr         : [],     //权益数组
         activities      : [],     //周五福利
         isUser          : false, //用户登录状态
diff --git a/pages/makeForm/makeForm.js b/pages/makeForm/makeForm.js
index 7af6182..2db2ff2 100644
--- a/pages/makeForm/makeForm.js
+++ b/pages/makeForm/makeForm.js
@@ -40,15 +40,11 @@ Page({
      */
     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,
+                makeItems : res.data.items
             })
         }).catch(err=>{
             if(!err.login){
diff --git a/pages/makeForm/makeForm.wxml b/pages/makeForm/makeForm.wxml
index 8d65ab4..a129258 100644
--- a/pages/makeForm/makeForm.wxml
+++ b/pages/makeForm/makeForm.wxml
@@ -28,7 +28,7 @@
         </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">
diff --git a/static/img/frozen_identity.png b/static/img/frozen_identity.png
deleted file mode 100644
index fa7e07533a1492bc362b45af0cfa3fe0270a7ef0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17533
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

diff --git a/static/img/frozen_identity_00.png b/static/img/frozen_identity_00.png
new file mode 100644
index 0000000000000000000000000000000000000000..35bfb679426607e6e010d458b2d2f92dbc9efd3c
GIT binary patch
literal 2306
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

literal 0
HcmV?d00001

diff --git a/static/img/frozen_identity_01.png b/static/img/frozen_identity_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2af7a99f8dc86425a33b27083b2cfe688472ac7
GIT binary patch
literal 2421
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
F{0+}n0qFn$

literal 0
HcmV?d00001