页面优化

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "4.2.60",
+    "name" : "kechengqiandao",
     "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",

pages/address/address-edit.vue

@@ -12,9 +12,22 @@
                 <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">
+            <view class="app-line app-border main-betweens cross-center">
                 <text class="app-text box-grow-0">性别:</text>
-                <input class="address-input" type="text" v-model="form.sex" placeholder="1: 男, 2: 女, 0: 未知"/>
+			<!-- 	<app-diy-form
+				        :list="form.sex"
+				        @input="handleGoodsFormInput"
+				        @validate="handleGoodsFormValidate"
+				        :sign="`${mchIndex},${goodsIndex},${goodsItem.form.id}`"></app-diy-form> -->
+                <!-- <input class="address-input" type="text" v-model="form.sex" placeholder="1: 男, 2: 女, 0: 未知"/> -->
+				<radio-group @change="radioChange" class="radio-groups">
+					<label class="uni-list-cell uni-list-cell-pd radio-groups" v-for="(item, index) in sex" :key="item.value">
+						<view>
+							<radio :value="item.value" :checked="index === current" />
+						</view>
+						<view>{{item.name}}</view>
+					</label>
+				</radio-group>
             </view>
             <view class="app-line app-border main-between cross-center">
                 <text class="app-text box-grow-0">联系电话:</text>
@@ -76,11 +89,22 @@
     import appAreaPicker from '../../components/page-component/app-area-picker/app-area-picker.vue';
     import addressParse from './address-parse.js';
     import appTextArea from '../../components/basic-component/app-textarea/app-textarea.vue';
+    import appDiyForm from '../../components/page-component/app-diy-form/app-diy-form.vue';
 
     export default {
         name: "address-edit",
         data() {
             return {
+				sex:[
+					{
+						value: '1',
+						name: '男'
+					},
+					{
+						value: '2',
+						name: '女'
+					},
+				],
                 form: {
                     location: '',
                     latitude: '',
@@ -111,7 +135,7 @@
                 theme: state => state.mallConfig.theme,
             }),
         },
-        components: {appLayout, appAreaPicker, appTextArea},
+        components: {appLayout, appAreaPicker, appTextArea, appDiyForm},
 
         onLoad: function (options) {
             this.getAutoInfo();
@@ -157,6 +181,35 @@
             }
         },
         methods: {
+			radioChange(e){
+				this.form.sex = e.target.value
+			},
+			handleGoodsFormInput(data, sign) {
+			    const signArr = sign.split(',');
+			    const mchIndex = parseInt(signArr[0]);
+			    const goodsIndex = parseInt(signArr[1]);
+			    const formId = parseInt(signArr[2]);
+			    const result = [];
+			    for (let i in data) {
+			        result[i] = {
+			            key: data[i].key,
+			            label: data[i].name,
+			            value: data[i].value,
+			            required: data[i].is_required,
+			        };
+			    }
+			    const formData = this.$store.state.orderSubmit.formData;
+			    formData.list[mchIndex].goods_list[goodsIndex].form_data = result;
+			    this.$store.commit('orderSubmit/mutSetFormData', formData);
+			},
+			handleGoodsFormValidate(result, sign) {
+			    const signArr = sign.split(',');
+			    const mchIndex = parseInt(signArr[0]);
+			    const goodsIndex = parseInt(signArr[1]);
+			    const formData = this.$store.state.orderSubmit.formData;
+			    formData.list[mchIndex].goods_list[goodsIndex].goods_form_validate_result = result;
+			    this.$store.commit('orderSubmit/mutSetFormData', formData);
+			},
             outputData(data) {
                 console.log(data);
             },
@@ -294,11 +347,17 @@
 					if(!this.form.age){
 						content = '年龄不能为空';
 					}
+                    if (!this.form.name) {
+                        content = '参训人不能为空';
+                    }     
                     if (!this.form.mobile) {
                         content = '联系方式不能为空';
                     }
-                    if (!this.form.name) {
-                        content = '姓名不能为空';
+					if (!this.form.sex) {
+                        content = '性别不能为空';
+                    }     
+					if (!this.form.idcard) {
+                        content = '身份证不能为空';
                     }
                     if (content) {
                         uni.showToast({
@@ -398,7 +457,21 @@
 </script>
 
 <style scoped lang="scss">
-
+	.radio-group{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.radio-groups{
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.main-betweens{
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+	}
     // 自动识别功能
     .automatic {
         height: #{100upx};

pages/order-submit/address-pick.vue

@@ -2,7 +2,7 @@
     <app-layout>
         <view class="page">
             <template v-if="list !== null">
-                <view v-if="!list.length" class="no-data mb-24">暂无地址</view>
+                <view v-if="!list.length" class="no-data mb-24">暂无报名信息</view>
                 <view v-else class="main-center dir-top-nowrap list">
                     <view v-for="(item,index) in list"
                           :key="index"

pages/order-submit/coupon-pick.vue

@@ -1,7 +1,8 @@
 <template>
     <app-layout>
         <view class="page">
-            <view class="mb-24 tip">注: 优惠券只能抵消商品金额，不能抵消运费。</view>
+            <!-- <view class="mb-24 tip">注: 优惠券只能抵消商品金额，不能抵消运费。</view> -->
+            <view class="mb-24 tip">注: 优惠券只能抵用报名金额</view>
             <view class="mb-24">
                 <app-button @click="setData(0)" type="general" round color="#999">不使用优惠券</app-button>
             </view>

pages/order-submit/order-submit.vue

@@ -50,7 +50,7 @@
 									参训人: {{verifyUndefined(previewData.address.name)}}
 								</view>	
 								<view class="box-grow-3">
-									性别: {{verifyUndefined(previewData.address.sex) == ''? '':previewData.address.sex == 0 ?'未知':previewData.address.sex == 1? '男':'女'}}
+									性别: {{verifyUndefined(previewData.address.sex) == '暂无数据'? '暂无数据':previewData.address.sex == 0 ?'未知':previewData.address.sex == 1? '男':'女'}}
 								</view>	
 								<view class="box-grow-4">
 									联系电话: {{verifyUndefined(previewData.address.mobile)}}
@@ -262,7 +262,8 @@
                                             </view>
                                         </view>
                                         <view class="dir-left-nowrap">
-                                            <view class="box-grow-1 goods-num">×{{subGoodsItem.num}}</view>
+                                            <!-- <view class="box-grow-1 goods-num">×{{subGoodsItem.num}}</view> -->
+                                            <view class="box-grow-1 goods-num"></view>
                                             <view class="box-grow-0 goods-price-info" :class="[`${theme}-color`]">
                                                 <view>
                                                     <text v-for="(customCurrency,customCurrencyIndex) in subGoodsItem.custom_currency"
@@ -410,8 +411,6 @@
 					console.log(typeof(value))
 					return value
 				}
-				// console.log(value)
-				// return (value == 'undefined' || value == '')? '暂无数据': value
 			},
             updateList(e,index) {
                 this.previewData.mch_list[index] = e;

pages/order/index/index.vue

@@ -1,14 +1,15 @@
 <template>
     <app-layout>
         <view class="order-box">
-            <view class="title-box">
+<!--            <view class="title-box">
                 <app-switch-tab @tabEvent="clickTab" :isborderBottom="false" :bgColor="bgColor"
                                 :currentIndex="currentIndex" :list="list"></app-switch-tab>
-            </view>
+            </view> -->
             <view v-if="is_show" class='content-box'>
                 <template v-if="orders.length">
-                    <view v-for='(item, index) in orders' :key='item.id'
-                          :style="{'margin-top': index == 0 ? '104rpx' : '0'}" class='order-item-box dir-top-wrap'>
+              <!--      <view v-for='(item, index) in orders' :key='item.id'
+                          :style="{'margin-top': index == 0 ? '104rpx' : '0'}" class='order-item-box dir-top-wrap'>  -->    
+						  <view v-for='(item, index) in orders' :key='item.id' class='order-item-box dir-top-wrap' style="margin-top:20rpx"> 
                         <app-jump-button :url="getPageUrl(item.id, item.sign)">
                             <view class="dir-top-nowrap" style="width: 100%">
                                 <view class='dir-left-nowrap view-1'>
@@ -437,7 +438,7 @@
         margin-top: #{150upx};
     }
     .content-box {
-        margin-top: 80#{rpx};
+        // margin-top: 80#{rpx};
     }
 
     .not-order-box {