合并分支 'wumengyu' 到 'master'

换接口域名



查看合并请求 !9

@@ -53,7 +53,7 @@ App({
             //init
             //init
             let that = this;
             let that = this;
             let postData = data;
             let postData = data;
-            let baseUrl = 'http://science.w.bronet.cn/api';
+            let baseUrl = 'https://kexueduizhang.cn/api';
             //网络请求
             //网络请求
             let header = {
             let header = {
                 'content-type': 'application/x-www-form-urlencoded'
                 'content-type': 'application/x-www-form-urlencoded'

@@ -19,7 +19,7 @@ page {
   background-repeat: no-repeat;
   background-repeat: no-repeat;
   -webkit-background-size: 100%;
   -webkit-background-size: 100%;
   background-size: 100%;
   background-size: 100%;
-  background-image: url('http://science.w.bronet.cn/static/images/background.png');
+  background-image: url('https://kexueduizhang.cn/static/images/background.png');
   /*background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1544437670097&di=0d34697ed78ebad78dafee6c88ed704a&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F0157955848b69ea801219c77902534.jpg');*/
   /*background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1544437670097&di=0d34697ed78ebad78dafee6c88ed704a&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F0157955848b69ea801219c77902534.jpg');*/
 }
 }
 .modal {
 .modal {

@@ -18,7 +18,7 @@
                 <view class="iconfont icon-daosanjiao"></view>
                 <view class="iconfont icon-daosanjiao"></view>
             </view>
             </view>
         </picker>
         </picker>
-        <picker bindchange="birthPickerChange" value="{{birth_date}}" mode="date">
+        <picker bindchange="birthPickerChange" value="{{birth_date || current_student.birthday}}" mode="date">
             <view class="select-box">
             <view class="select-box">
                 <view class="select-picker">
                 <view class="select-picker">
                     <view class="sex">生 日：</view>
                     <view class="sex">生 日：</view>

@@ -20,7 +20,7 @@ page {
   height: 370rpx;
   height: 370rpx;
   border-radius: 20rpx;
   border-radius: 20rpx;
   overflow: hidden;
   overflow: hidden;
-  background-image: url('http://science.w.bronet.cn/static/images/card.png');
+  background-image: url('https://kexueduizhang.cn/static/images/card.png');
   background-repeat: no-repeat;
   background-repeat: no-repeat;
   -webkit-background-size: 100%;
   -webkit-background-size: 100%;
   background-size: 100%;
   background-size: 100%;