组件样式修改

components/page-component/app-attr/app-attr.vue

@@ -27,7 +27,8 @@
 								   <app-member-mark></app-member-mark>
 							   </view>
 						   </view>
-						   <view class="stock">库存：{{attrNum}}</view>
+						   <!-- <view class="stock">库存：{{attrNum}}</view> -->
+						   <view class="stock">剩余名额：{{attrNum}}</view>
 					   </view>
 				   </view>
 				   <view class="second">
@@ -41,7 +42,7 @@
 							   </view>
 						   </view>
 					   </view>
-					   <view v-if="chooseNumber" class="dir-left-nowrap number-box cross-center">
+<!-- 					   <view v-if="chooseNumber" class="dir-left-nowrap number-box cross-center">
 						   <view class="box-grow-1">数量</view>
 						   <view class="block box-grow-0 cross-center main-center" @click="numberSub"
 						         :class="number <= 1 ? 'disabled' : ''">-
@@ -51,12 +52,12 @@
 							              :focus="false" width="88"></app-input>
 						   </view>
 						   <view class="block box-grow-0 cross-center main-center" @click="numberAdd">+</view>
-					   </view>
+					   </view> -->
 				   </view>
 				   <view class="three dir-left-nowrap">
-					   <view class="box-grow-1 main-center cross-center" v-if="cartShow"
+					   <!-- <view class="box-grow-1 main-center cross-center" v-if="cartShow"
 					         :class="theme + '-secondary-background'" @click="cart">{{addText}}
-					   </view>
+					   </view> -->
 					   <view v-if="is_show_buy" class="box-grow-1 main-center cross-center buy" :class="theme + '-background'" @click="buy">
 						   {{buyText}}
 					   </view>

components/page-component/app-goods-list/app-goods-list.vue

@@ -8,11 +8,11 @@
                         <view class="out-dialog" v-if="goods.goods_stock == 0 && appSetting.is_show_stock == '1'">
                             <image :src="appSetting.is_use_stock == '1' ? appImg.plugins_out : appSetting.sell_out_pic"></image>
                         </view>
-                        <app-image :img-src="goods.cover_pic" borderRadius="16rpx" width="200rpx"
+                        <app-image :img-src="goods.cover_pic" borderRadius="16rpx" width="251rpx"
                                    height="200rpx"></app-image>
                     </view>
                     <view class="box-grow-1 dir-top-nowrap content main-between">
-                        <view class="box-grow-0 t-omit-two goods-name" v-if="isShowGoodsName == 1">{{goods.name}}</view>
+                        <view class="box-grow-0 t-omit-two goods-name goods-name-style" v-if="isShowGoodsName == 1">{{goods.name}}</view>
                         <view class="dir-top-nowrap" :class="isShowGoodsName == 1 ? 'box-grow-0' : 'box-grow-1'">
                             <view class="box-grow-0 cross-bottom"
                                   v-if="goods.is_level == 1 && goods.is_negotiable != 1 && is_show_member">
@@ -24,20 +24,24 @@
                             </app-sup-vip>
                             <view :class="isShowCart == 0 || goods.is_negotiable == 1 ? 'dir-left-nowrap' : 'dir-top-nowrap'"
                                   class="box-grow-1">
-                                <view class="box-grow-1" :class="theme">
-                                    <template v-if="goods.is_negotiable == 1">
-                                        <view>价格面议</view>
-                                    </template>
-                                    <template v-else>
-                                        <app-price :price="`${goods.price}`" type="text-price-all"></app-price>
-                                    </template>
-                                </view>
                                 <view class="dir-left-nowrap cross-center sales-box">
-                                    <view v-if="goods.sales && goods.is_negotiable != 1" class="box-grow-1 sales">{{goods.sales}}</view>
-                                    <view @click.stop="specification(goods)" class="box-grow-0 cross-center main-center cart-box"
+									<view class="box-grow-1 box-grow--moeny" :class="theme">
+										<template v-if="goods.is_negotiable == 1">
+											<view>价格面议</view>
+										</template>
+										<template v-else>
+											<app-price :price="`${goods.price}`" type="text-price-all"></app-price>
+										</template>
+									</view>
+                                    <!-- <view v-if="goods.sales && goods.is_negotiable != 1" class="box-grow-1 sales">{{goods.sales}}</view> -->
+                                    <view v-if="goods.sales && goods.is_negotiable != 1" class="box-grow-1 sales"></view>
+<!--                                    <view @click.stop="specification(goods)" class="box-grow-0 cross-center main-center cart-box"
                                          v-if="goods.is_negotiable != 1 && isShowCart == 1 && goods.goods_stock > 0">
                                         <img class="goods-cart" src="/static/image/icon/goods-cart.png">
-                                    </view>
+                                    </view> -->
+									<view class="moneyAndBtn-btn" @click.stop="specification(goods)" v-if="goods.is_negotiable != 1 && isShowCart == 1 && goods.goods_stock > 0">
+										立即报名
+									</view>
                                 </view>
                             </view>
                         </view>
@@ -459,6 +463,21 @@
 </script>
 
 <style scoped lang="scss">
+	.box-grow--moeny{
+		font-size:34rpx;
+		font-family:Source Han Sans CN;
+		font-weight:500;
+		color: #FF4800;
+	}
+	.goods-name-style{
+		font-size:34rpx;
+		font-family:Source Han Sans CN;
+		font-weight:500;
+		color:rgba(61,61,61,1);
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
     .attr {
         position: fixed;
         bottom: 0;
@@ -624,6 +643,7 @@
 
             .goods-name {
                 line-height: 1.4;
+
             }
 
             .padding {
@@ -657,5 +677,16 @@
         .sales-box {
             /*position: relative;*/
         }
+		.moneyAndBtn-btn{
+			font-size:34upx;
+			font-family:Source Han Sans CN;
+			font-weight:500;
+			color: #fff;
+			background: #F09A21;
+			padding: 10upx 22upx;
+			text-align: center;
+			box-shadow: 0 4px 10px #999;
+			border-radius: 8upx;
+		}
     }
 </style>

components/page-component/app-index-cat/app-index-cat.vue

@@ -3,9 +3,9 @@
         <view class="dir-left-nowrap cross-center cat-top">
             <view class="box-grow-1 main-center">
                 <view class="cat-pic-url" v-if="catPicUrl">
-                    <app-image :img-src="catPicUrl" width="40rpx" height="40rpx"></app-image>
+                    <app-image :img-src="catPicUrl" width="29rpx" height="31rpx"></app-image>
                 </view>
-                <view>{{name}}</view>
+                <view class="cat-pic-name">{{name}}</view>
             </view>
             <view class="dir-left-nowrap cross-center more" @click="jump">
                 <view>更多</view>
@@ -67,9 +67,14 @@
             position: relative;
 
             .cat-pic-url {
-                width: #{40rpx};
-                height: #{40rpx};
-                margin-right: #{24rpx};
+                // width: #{40rpx};
+                // height: #{40rpx}; 
+				width: #{29rpx};
+                height: #{34rpx};
+                margin-right: #{10rpx};
+				display: flex;
+				align-items: flex-end;
+				justify-content: center;
             }
 
             .more {
@@ -90,4 +95,15 @@
             }
         }
     }
+	.main-center{
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		.cat-pic-name{
+			font-size:34upx;
+			font-family:Source Han Sans CN;
+			font-weight:500;
+			color:rgba(61,61,61,1);
+		}
+	}
 </style>

components/page-component/index/app-index.vue

@@ -1,6 +1,16 @@
 <template>
     <view class="app-index">
 	    
+		<view class="custom-header-container">
+			<view class="header-bg" :style="{height:headerBgHeight}">
+				<image src="../../../static/image/course/bg.png"/>
+			</view>
+			<view class="custom-header-status-bar" :style="{height:getStausBarHeight}"></view>
+			<view class="custom-header-top-container">
+				<view class="custom-header-title">课程报名</view>
+			</view>
+		</view>
+	    
         <!-- #ifdef MP-WEIXIN -->
         <template v-if="mall.setting.is_official_account == 1">
             <official-account></official-account>
@@ -9,7 +19,7 @@
         <view class="page-width">
             <app-quick-navigation></app-quick-navigation>
         </view>
-	    
+		
         <block v-for="(item, index) in newPage" :key="index">
             <template v-if="item.key === 'search'">
                 <view class="page-width">
@@ -18,10 +28,10 @@
             </template>
 	        
             <template v-else-if="item.key === 'banner'">
-                <view v-if="item.banners.length > 0">
+                <view v-if="item.banners.length > 0" class="banner">
                     <app-swiper
 	                    imageKey="pic_url"
-	                    :swiperHeight=350
+	                    :swiperHeight=300
                         :swiperList="item.banners"
                     ></app-swiper>
                 </view>
@@ -202,6 +212,22 @@
                 });
                 
             },
+			getStausBarHeight(){
+				try {
+					const res = uni.getSystemInfoSync();
+					return res.statusBarHeight + 'px';
+				} catch (err) {
+					console.log(err)
+				}
+			},
+			headerBgHeight(){
+				try {
+					const res = uni.getSystemInfoSync();
+					return 120+44+res.statusBarHeight + 'px';
+				} catch (err) {
+					console.log(err)
+				}
+			}
         },
 	    
 	    watch: {
@@ -265,4 +291,23 @@
     .mt-20 {
         margin-top: #{20rpx};
     }
+	.banner{
+		width: 94vw;
+		height: auto;
+		margin: 0 3vw;
+		padding: 5vw 0;
+		z-index: 1;
+		.swipe {
+			width: 100%;
+			height: 42vw;
+			/* background: #eee; */
+			border-radius: 10px;
+			overflow: hidden;
+			z-index: 1;
+			.banner-img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 </style>

pages.json

@@ -3,7 +3,8 @@
     {
       "path": "pages/index/index",
       "style": {
-        "navigationBarTitleText": "首页"
+        "navigationBarTitleText": "首页",
+		"navigationStyle": "custom"
       }
     },
     {

pages/address/address-edit.vue

@@ -2,14 +2,18 @@
     <app-layout>
         <view class="app-view">
             <!-- 自动识别功能 -->
-            <view class="automatic dir-left-nowrap cross-center main-between">
+ <!--           <view class="automatic dir-left-nowrap cross-center main-between">
                 <input type="text" v-model="automatic" placeholder-class="place-automatic"
                        placeholder="复制收货信息（姓名前后请输入空格）" @confirm="getAddress">
                 <button @click="getAddress">自动识别</button>
-            </view>
+            </view> -->
 
             <view class="app-line app-border main-between cross-center">
-                <text class="app-text box-grow-0">收货人</text>
+                <text class="app-text box-grow-0">参训人</text>
+                <input class="address-input" type="text" v-model="form.name" />
+            </view>
+            <view class="app-line app-border main-between cross-center">
+                <text class="app-text box-grow-0">性别</text>
                 <input class="address-input" type="text" v-model="form.name" />
             </view>
             <view class="app-line app-border main-between cross-center">
@@ -17,33 +21,50 @@
                 <input class="address-input" type="number" v-model="form.mobile" />
             </view>
             <view class="app-line app-border main-between cross-center">
+                <text class="app-text box-grow-0">年龄</text>
+                <input class="address-input" type="number" v-model="form.mobile" />
+            </view>
+            <view class="app-line app-border main-between cross-center">
+                <text class="app-text box-grow-0">体重</text>
+                <input class="address-input" type="number" v-model="form.mobile" />
+            </view>
+            <view class="app-line app-border main-between cross-center">
+                <text class="app-text box-grow-0">身高</text>
+                <input class="address-input" type="number" v-model="form.mobile" />
+            </view>
+            <view class="app-line app-border main-between cross-center">
+                <text class="app-text box-grow-0">身份证号码</text>
+                <input class="address-input" type="number" v-model="form.mobile" />
+            </view>
+<!--            <view class="app-line app-border main-between cross-center">
                 <text class="app-text box-grow-0">所在地区</text>
                 <view class="box-grow-1 area-left">
                     <app-area-picker v-if="tt_area_show"
                                      @customevent="areaEvent"
                                      :ids="[form.province_id,form.city_id,form.district_id]"></app-area-picker>
                 </view>
-            </view>
+            </view> -->
 
             <!-- #ifndef MP-TOUTIAO -->
-            <view v-if="is_refund_address == 0" class="app-line app-border main-between cross-center">
+  <!--          <view v-if="is_refund_address == 0" class="app-line app-border main-between cross-center">
                 <text class="app-text box-grow-0">定位地址</text>
                 <view class="h-100 main-right dir-left-nowrap cross-center box-grow-1" @click="getChooseLocation">
                     <view class="box-grow-0 c-address">{{form.location}}</view>
                     <icon class="box-grow-0 icon-arrow-image"></icon>
                 </view>
-            </view>
+            </view> -->
             <!-- #endif -->
 
-            <view class="app-line main-between cross-center">
+       <!--     <view class="app-line main-between cross-center">
                 <text class="app-text box-grow-0">详细地址</text>
                 <input class="address-input" type="text" :focus="focus" @blur="focus = false" v-model="form.detail" />
             </view>
-            <view class="tip" @click="detailFocus">请输入具体门牌号以便配送</view>
+            <view class="tip" @click="detailFocus">请输入具体门牌号以便配送</view> -->
         </view>
         <view class="app-button">
             <app-button @click="submit" :theme="theme" arrangement="row" type="important" round width="90%">
-                <text class="app-text">保存地址</text>
+                <!-- <text class="app-text">保存地址</text> -->
+                <text class="app-text">保存信息</text>
             </app-button>
         </view>
     </app-layout>
@@ -449,7 +470,8 @@
             text.app-text {
                 font-size: #{28rpx};
                 color: $uni-important-color-black;
-                width: #{124rpx};
+                // width: #{124rpx};
+                width: #{150rpx};
             }
         }
 

pages/goods/goods.vue

@@ -77,10 +77,10 @@
 					    <image src="../../static/image/icon/index.png"></image>
 					    <view>首页</view>
 				    </view>
-				    <view class="dir-top-nowrap main-center cross-center little box-grow-0" @click="favorite">
+			<!-- 	    <view class="dir-top-nowrap main-center cross-center little box-grow-0" @click="favorite">
 					    <image :src="goods.favorite ? '../../static/image/icon/icon-favorite-active.png' : '../../static/image/icon/icon-favorite.png'"></image>
 					    <view>收藏</view>
-				    </view>
+				    </view> -->
 				    <view class="box-grow-1 dir-left-nowrap btn" v-if="goods.is_negotiable === 1">
 					    <block v-for="(item, index) in mall.setting.good_negotiable" :key="index">
 						    <template v-if="item === 'contact_tel'">
@@ -121,12 +121,12 @@
                             <view style="width: 100%;background-color: #CDCDCD;color: #fff;" class="main-center cross-center button">已售罄</view>
                         </view>
                         <view class="box-grow-1 dir-left-nowrap" style="height: 100%;" v-else>
-    					    <view class="main-center cross-center button"
+    			<!-- 		    <view class="main-center cross-center button"
     					          :class="theme + '-secondary-background'"
     					          @click="clickAttr">
     						    加入购物车
-    					    </view>
-    					    <view class="main-center cross-center button"
+    					    </view> -->
+    					    <view class="main-center cross-center button buttonAttr"
     					          :class="theme + '-background'"
     					          @click="clickAttr"
     					    >立即购买
@@ -354,6 +354,10 @@
         padding: #{24rpx 24rpx 0 24rpx};
         background-color: #ffffff;
         color: $uni-important-color-black;
+		font-size:36rpx;
+		font-family:Source Han Sans CN;
+		font-weight:500;
+		color:rgba(62,62,62,1);
     }
 
 	.price {
@@ -387,7 +391,9 @@
         background-color: #ffffff;
 
         .little {
-            width: #{110rpx};
+            // width: #{110rpx};
+            // width: #{30%};
+            width: #{220rpx};
             height: 100%;
             background-color: #ffffff;
             font-size: #{20rpx};
@@ -413,6 +419,10 @@
             width: 50%;
             height: 100%;
         }
+		.buttonAttr{
+			width: 100%;
+			height: 100%;
+		}
 
         .service {
             background-color: #446dfd;

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-layout :haveBackground="haveBackground">
-<!--        <app-my-app></app-my-app>
+       <app-my-app></app-my-app>
 
         <view v-if="type === 'mall'">
             <app-index v-if="destroy"
@@ -18,9 +18,8 @@
                           :scrollTop="scrollTop"
                           :is_storage="is_storage"
             ></app-diy-page>
-        </view> -->
-	<view class="course">
-		<!-- 头部 -->
+        </view>
+<!-- 	<view class="course">
 		<view class="custom-header-container">
 			<view class="header-bg" :style="{height:headerBgHeight}">
 				<image src="../../static/image/course/bg.png"/>
@@ -71,7 +70,7 @@
 				
 			</view>
 		</view>
-	</view>
+	</view> -->
         <app-buy-prompt v-if="config.is_purchase_frame === `1`"></app-buy-prompt>
     </app-layout>
 </template>
@@ -347,6 +346,7 @@
 				font-weight:400;
 				font-family:Source Han Sans CN;
 				color: #FBF9F9;
+				z-index: 1;
 			}
 		}
 		.cu-bar{

pages/order-submit/address-pick.vue

@@ -26,7 +26,7 @@
                     </app-form-id>
                 </view>
                 <!-- #ifdef MP-WEIXIN -->
-                <view class="box-grow-1">
+   <!--             <view class="box-grow-1">
                     <app-form-id>
                         <app-button :theme="theme" type="important" round background="#08c303"
                                     @click="wechatAddAddress">
@@ -36,7 +36,7 @@
                             </view>
                         </app-button>
                     </app-form-id>
-                </view>
+                </view> -->
                 <!-- #endif -->
             </view>
             <template v-if="notInPointList !== null && notInPointList.length">

pages/order-submit/order-submit.vue

@@ -22,25 +22,64 @@
                 <view v-else @click="navigateAddress" class="address">
                     <app-order-submit-row>
                         <view v-if="previewData.address">
-                            <view class="dir-left-nowrap mb-12">
-                                <view class="box-grow-1">收货人: {{previewData.address.name}}</view>
-                                <view class="box-grow-0">{{previewData.address.mobile}}</view>
+                           <!--   <view class="dir-left-nowrap mb-12">
+                                <view class="box-grow-1">参训人: {{previewData.address.name}}</view>
+                                <view class="box-grow-0">电话: {{previewData.address.mobile}}</view>
                             </view>
-                            <view class="mb-12">
+                          <view class="mb-12">
                                 收货地址:
                                 {{previewData.address.province}}
                                 {{previewData.address.city}}
                                 {{previewData.address.district}}
                                 {{previewData.address.detail}}
+                            </view> -->
+				<!-- 			<view class="dir-left-nowrap mb-12">
+								<view class="box-grow-1">性别: {{previewData.address.name}}</view>
+								<view class="box-grow-0">年龄: {{previewData.address.mobile}}</view>
                             </view>
+							<view class="dir-left-nowrap mb-12">
+								<view class="box-grow-1">体重: {{previewData.address.name}}</view>
+								<view class="box-grow-0">年龄: {{previewData.address.mobile}}</view>
+                            </view>				
+							<view class="dir-left-nowrap mb-12">
+								<view class="box-grow-1">身高: {{previewData.address.name}}</view>
+								<view class="box-grow-0">身份证号码: {{previewData.address.mobile}}</view>
+                            </view> -->
+							<view class="felx-three">
+								<view class="box-grow-2">
+									参训人: 诸葛村夫
+								</view>	
+								<view class="box-grow-3">
+									性别: 男
+								</view>	
+								<view class="box-grow-4">
+									联系电话: 13985840801
+								</view>
+							</view>
+							<view class="felx-three">
+								<view class="box-grow-2">
+									年龄: 100
+								</view>	
+								<view class="box-grow-3">
+									体重: 男
+								</view>	
+								<view class="box-grow-4">
+									身高: 13985840801
+								</view>
+							</view>
+							<view class="felx-three">
+								<view class="box-grow-5">
+									身份证号码: 51300198808080018
+								</view>	
+							</view>
                         </view>
                         <view v-else>请选择收货地址</view>
                         <view v-if="previewData.has_ziti" class="ziti-tip" :class="[`${theme}-color`]">
                             (收货地址中的手机号码将用于自提信息)
                         </view>
-                        <view slot="footer">
+                    <!--    <view slot="footer">
                             <image class="bottom-image" :src="appImg.common.address_bottom"></image>
-                        </view>
+                        </view> -->
                     </app-order-submit-row>
                 </view>
             </template>
@@ -52,7 +91,7 @@
 
                     <view class="mch-name">{{mch.mch.name}}</view>
 
-                    <view v-if="mch.show_delivery !== false" class="dir-left-nowrap cross-center delivery">
+<!--                    <view v-if="mch.show_delivery !== false" class="dir-left-nowrap cross-center delivery">
                         <view class="box-grow-1">配送方式</view>
                         <view class="box-grow-0">
                             <view v-for="(sendType, sendTypeIndex) in mch.delivery.send_type_list"
@@ -63,7 +102,7 @@
                                 {{sendType.name}}
                             </view>
                         </view>
-                    </view>
+                    </view> -->
 
                     <view class="pick-up cross-center" v-if="!mch.pick_up_enable">
                         <view>以下商品满{{mch.pick_up_price}}元起送</view>
@@ -165,7 +204,7 @@
                         </view> -->
                     </view>
 
-                    <view v-if="mch.show_express_price !== false">
+<!--                    <view v-if="mch.show_express_price !== false">
                         <app-order-submit-row :show-nav="false" :showBorder="false">
                             <view class="dir-left-nowrap">
                                 <view class="box-grow-1">运费</view>
@@ -179,7 +218,7 @@
                                 </view>
                             </view>
                         </app-order-submit-row>
-                    </view>
+                    </view> -->
                     <view v-if="mch.order_form && mch.order_form.status == '1'">
                         <app-diy-form :title="mch.order_form.name"
                                       :list="mch.order_form.value"
@@ -784,7 +823,39 @@
     $borderColor: $uni-weak-color-one;
     $xWidth: #{24rpx};
     $yWidth: #{24rpx};
-
+	.felx-three{
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		.box-grow-2, .box-grow-3, .box-grow-4{
+			font-size: 24rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: rgba(100,100,100,1);
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}	
+		.box-grow-2{
+			width: 30%;
+		}
+		.box-grow-3{
+			width: 30%;
+		}
+		.box-grow-4{
+			width: 40%;
+		}
+		.box-grow-5{
+			width: 100%;
+			font-size: 24rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: rgba(100,100,100,1);
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
     .pick-up {
         margin-top: #{20rpx};
         background: #fff4f3;
@@ -919,6 +990,10 @@
                     }
 
                     .goods-name {
+						font-size:24rpx !important;
+						font-family:Source Han Sans CN;
+						font-weight:400;
+						color:rgba(72,72,72,1);
                         height: #{84rpx};
                         line-height: #{42rpx};
                         display: -webkit-box;
@@ -985,6 +1060,7 @@
             }
 
             .remark {
+				height: 339rpx;
                 background: #fff;
                 border-bottom: #{1rpx} solid $borderColor;
                 padding: 0 #{12rpx};