no message

.env.js

@@ -3,8 +3,8 @@ let ENV_CONFIG = null;
 
 if (nodeEnv === 'development') {
     //开发环境
-    // ENV_CONFIG = require('.env.prod.js');
-	ENV_CONFIG = require('.env.dev.js');
+    ENV_CONFIG = require('.env.prod.js');
+	// ENV_CONFIG = require('.env.dev.js');
 } else {
     //生产环境
     ENV_CONFIG = require('.env.prod.js');

components/en-from/en-select/en-select.vue

@@ -9,7 +9,7 @@
         <text class="iconfont">&#xe62b;</text>
       </view>
     </view>
-    <uni-data-picker :popup-title="'选择'+label" :localdata="localData" ref="pickerObj" v-show="showPicker"
+    <uni-data-picker :popup-title="'选择'+label" :localdata="localData" ref="pickerObj" v-model="inputValue" v-show="showPicker"
                      @change="pickerChange"  :border="false" :clear-icon="false" @popupclosed="setPopupClosed">
     </uni-data-picker>
   </view>
@@ -65,8 +65,11 @@ export default {
       this.setValue()
     },
     'inputValue': function () {
+		console.log("1111111111111",this.valueType, this.inputValue);
       if(this.valueType==='1'){
+		  console.log(this.inputValue.join(','));
         this.$emit('input', this.inputValue.join(','))
+		// this.$emit('upValue',this.inputValue.join(','))
       }else {
         this.$emit('input', this.inputValue)
       }

manifest.json

@@ -102,8 +102,8 @@
             "https" : false,
             "proxy" : {
                 "/api" : {
-                    "target" : "https://test-userapi.sjzkeji.com",
-                    // "target" : "https://userapi.sjzkeji.com",
+                    // "target" : "https://test-userapi.sjzkeji.com",
+                    "target" : "https://userapi.sjzkeji.com",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages-address/address.vue

@@ -15,7 +15,7 @@
 				<view class=" mb-8 display-flex">
 					<view class="fs-34 fw-500 mr-10 w-556">
 						<span v-if="item.is_default == 1" class="list-box-only fs-24 fc-FF7F00 text-align-center">默认</span>
-						{{item.address}}{{item.school_name}}{{item.dorm_name}}
+						{{item.school_name}}{{item.dorm_name}}{{item.address}}
 					</view>
 				</view>
 				<view class="w-520 fs-26 fc-9 align-items-center">

pages-address/edit-add.vue

@@ -8,11 +8,12 @@
 				<EnInput label="收货人" placeholder="请输入收货人姓名" v-model="fromData.consignee"></EnInput>
 				<EnInput label="电话号码" type="number" placeholder="请输入电话号码" v-model="fromData.phone"></EnInput>
 
-				<EnSelect v-if="schoolList.length > 0" label="收货学校" placeholder="请选择收货学校" v-model="fromData.school_id"
-					:localData="schoolList" :valueType="'1'"></EnSelect>
+				<EnSelect v-if="schoolList.length > 0" label="收货学校" placeholder="请选择收货学校"
+					v-model="fromData.dorm_school_id" :localData="schoolList" :valueType="'1'" @upValue=upValue>
+				</EnSelect>
 
-				<EnSelect label="楼栋" placeholder="请选择楼栋" v-if="isDorm" v-model="fromData.dorm_id"
-					:localData="builList" :valueType="'1'"></EnSelect>
+				<EnSelect label="楼栋" placeholder="请选择楼栋" v-if="isDorm" v-model="fromData.dorm_id" :localData="builList"
+					:valueType="'1'"></EnSelect>
 
 				<EnInput label="详细地址" placeholder="请输入详细地址" v-model="fromData.address"></EnInput>
 			</view>
@@ -47,7 +48,6 @@
 	import tools from "@/service/tools.js";
 	import EnSelect from "@/components/en-from/en-select/en-select";
 	import EnInput from "@/components/en-from/en-input/en-input";
-
 	export default {
 		components: {
 			EnInput,
@@ -71,18 +71,16 @@
 					consignee: '',
 					phone: '',
 					dorm_id: '',
-					school_id: '',
-
-					dorm_name: '',
+					dorm_school_id: '',
 					school_name: '',
 				},
-
 				schoolList: [],
 				builList: [],
 				isAJAX: false,
 				isDorm: false,
 				time: '',
-				selectId: false
+				selectId: false,
+				a: 1
 			}
 		},
 		onLoad(e) {
@@ -95,23 +93,38 @@
 			}
 		},
 		watch: {
-			'fromData.school_id'(newval,old) {
-				console.log(old, 'old');
-				console.log(newval, 'newval');
-				if(newval != old && !this.selectId) {
-					this.fromData.dorm_id = ''
-				}
-				this.getAddressDorm()
-			},
+			'fromData.dorm_school_id': {
+				handler(newval, old) {
+					console.log(old, 'old');
+					console.log(newval, 'newval');
+					if (newval != old && !this.selectId) {
+						this.fromData.dorm_id = ''
+					}
+					this.getAddressDorm()
+				},
+				immediate: true, // 立即执行
+			}
 		},
 		methods: {
+			upValue(val) {
+				// if (this.selectId) {
+				// this.fromData.dorm_id = ''
+				// this.fromData.dorm_id = val+ ''
+				// }
+				// this.getAddressDorm()
+			},
 			getInfo(id) {
 				getAddressInfo({
 					id: id
 				}).then((res) => {
 					if (res.code === 1) {
-						this.fromData = res.data;
-						this.fromData.school_id = res.data.school_id + '';
+						this.fromData.id = res.data.id;
+						this.fromData.address = res.data.address;
+						this.fromData.consignee = res.data.consignee;
+						this.fromData.is_default = res.data.is_default;
+						this.fromData.phone = res.data.phone;
+						this.fromData.school_name = res.data.school_name;
+						this.fromData.dorm_school_id = res.data.school_id + '';
 						this.fromData.dorm_id = res.data.dorm_id + '';
 						this.getAddressSchool();
 					}
@@ -138,7 +151,7 @@
 			},
 			getAddressDorm() {
 				getAddressDorm({
-					school_id: this.fromData.school_id
+					dorm_school_id: this.fromData.dorm_school_id
 				}).then((res) => {
 					if (res.code === 1) {
 						this.builList = res.data.map(obj => {

pages-school/add-circle.vue

@@ -115,7 +115,7 @@
 				this.isAJAX = true;
 				let circleSchoolId = uni.getStorageSync('circleSchoolId');
 				let school_id = uni.getStorageSync('school_id');
-				this.fromData.school_id = circleSchoolId ? circleSchoolId : school_id;
+				this.fromData.alumni_school_id = circleSchoolId ? circleSchoolId : school_id;
 				alumniSave(this.fromData).then((res) => {
 					if (res.code === 1) {
 						tools.success(res.msg, 1000)

pages-school/school-circle.vue

@@ -27,7 +27,7 @@
 				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle" :current="current">
 					<swiper class="swiper" @change="change" :autoplay='true' :circular='true' interval="4000">
 						<swiper-item v-for="(item,i) in bannerList" :key="i">
-							<image class="swiper-item" :src="item.image" mode="aspectFill" @click="bannerClock(item)">
+							<image class="swiper-item" :src="item.image" mode="" @click="bannerClock(item)">
 							</image>
 						</swiper-item>
 					</swiper>
@@ -450,7 +450,7 @@
 			getList() {
 				let circleSchoolId = uni.getStorageSync('circleSchoolId');
 				let school_id = uni.getStorageSync('school_id');
-				this.fromData.school_id = circleSchoolId ? circleSchoolId : school_id
+				this.fromData.alumni_school_id = circleSchoolId ? circleSchoolId : school_id
 				if (this.isAjax) {
 					return
 				}

pages-takeout/run-errands.vue

@@ -6,7 +6,7 @@
 				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle" :current="current">
 					<swiper class="swiper" @change="change" :autoplay='true' :circular='true' interval="4000">
 						<swiper-item v-for="(item,i) in bannerList" :key="i">
-							<image class="swiper-item" :src="item.image" mode="aspectFill">
+							<image class="swiper-item" :src="item.image" mode="">
 							</image>
 						</swiper-item>
 					</swiper>

pages-takeout/shop-mod/menu.vue

@@ -21,9 +21,8 @@
 							<view class="mb-8">
 								<view class="mb-4 goods-name text-overflow-ellipsis fs-32 fw-600">{{info.goods_name}}
 								</view>
-								<view class="text-overflow-ellipsis-one fw-400 fc-9 fs-24 mb-2 goods-name"
-									v-if="info.spec_type == 1">
-									{{info.goods_desc}}
+								<view class="text-overflow-ellipsis-one fw-400 fc-9 fs-24 mb-2 goods-name" v-if="info.spec_type == 1">
+									{{info.goods_desc?info.goods_desc:''}}
 								</view>
 								<view class="fw-400 fc-9 fs-24">月销{{info.sales}}</view>
 							</view>

pages/index/index.vue

@@ -30,7 +30,7 @@
 				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle" :current="current">
 					<swiper class="swiper" @change="change" :autoplay='true' :circular='true' interval="4000">
 						<swiper-item v-for="(item,i) in bannerList" :key="i">
-							<image class="swiper-item" :src="item.image" mode="aspectFill" @click="bannerClock(item)">
+							<image class="swiper-item" :src="item.image" mode="" @click="bannerClock(item)">
 							</image>
 						</swiper-item>
 					</swiper>
@@ -1381,6 +1381,7 @@
 						.goods-items-img {
 							width: 208rpx;
 							height: 200rpx;
+							overflow: hidden;
 						}
 					}
 				}