Merge remote-tracking branch 'origin/master'

addons/theme/stv1/_static_w3g/css/common.css

@@ -790,4 +790,12 @@ div::-webkit-scrollbar {
 
 
 .vip_buy_top_state {
 .vip_buy_top_state {
 	padding: 0.375rem 0.75rem;
 	padding: 0.375rem 0.75rem;
+}
+
+.vip_buy_type {
+	height:17px;
+	border-radius:9px;
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
+	width: 2.4375rem;
 }
 }
\ No newline at end of file

apps/home/Tpl/default/User/recharge_w3g.html

@@ -12,6 +12,14 @@
 				<span class="text_16_600 color_333333 self_center" style="margin-left: 0.5rem;">选择会员</span>
 				<span class="text_16_600 color_333333 self_center" style="margin-left: 0.5rem;">选择会员</span>
 			</div>
 			</div>
 		</div>
 		</div>
+		<div class="home_list_part layout_h_b">
+			<div v-for="(item, index) in vips" :key="index" class="layout_h_v_c">
+				<van-icon @click="type = item.id" :name="type == item.id ? '__THEME__/img/picker_y@3x.png' : '__THEME__/img/picker_n@3x.png'" style="margin-right: 0.4375rem;" size="18" ></van-icon>
+				<div class="vip_buy_type layout_h_c" :style="item.color">
+					<span class="text_12_400 self_center color_white" >{{item.title}}</span>
+				</div>
+			</div>
+		</div>
 	</div>
 	</div>
 </div>
 </div>
 
 
@@ -133,6 +141,29 @@
 </if>
 </if>
 
 
 <script>
 <script>
+	
+	new Vue({
+		el: '#app',
+		data: function() {
+			return {
+				type: 1,
+				vips: []
+			}
+		},
+		created:function(){
+			this.vips = {:json_encode($user_vip)};
+			this.vips.forEach( r => {
+				if(r.title == "乡试") {
+					r.color = { background: "#65C000" }
+				} else if(r.title == "会试") {
+					r.color = { background: "#32C5FF" }
+				} else if(r.title == "殿试") {
+					r.color = { background: "#F5A623" }
+				}
+			})
+		}
+	})
+	
     '<if condition="$is_wx eq false">'
     '<if condition="$is_wx eq false">'
     $(function(){
     $(function(){
         var wpay = "{$_GET['wpay']}";
         var wpay = "{$_GET['wpay']}";