城市列表页添加滚动，优化切换城市后发布按钮无法点击问题，修改订单状态文字

@@ -93,6 +93,7 @@ Page({
     },
     //提交
     submit(e) {
+        console.log('formid', e.detail.formId);
         this.data.questionList.forEach((item) => {
             if (item.choose === false) {
                 wx.showToast({title: '请答完所有的题', icon: 'none'});

@@ -60,6 +60,7 @@ Page({
         if(current === 0) {
             this.getCityList();
         }else if(current === 1) {
+            console.log(1);
             this.getAbroadList()
         }
         // this.getList();

@@ -10,9 +10,11 @@
         <!--<image src="../../../images/search@2x.png" class="search-icon" bindtap="startSearch"></image>-->
         <!--<view class="iconfont icon-arrow-down"></view>-->
     </view>
-    <view class="city-box {{current===1?'margin':''}}">
-        <view wx:for="{{city_picker_list}}" wx:key="index">
-            <view class="city-item {{current_city === index?'change-bg':''}}" bindtap="chooseCity" data-index="{{index}}" >{{item}}</view>
+    <!--<view class="scroll-box">-->
+        <view class="city-box {{current===1?'margin':''}}">
+            <view wx:for="{{city_picker_list}}" wx:key="index">
+                <view class="city-item {{current_city === index?'change-bg':''}}" bindtap="chooseCity" data-index="{{index}}" >{{item}}</view>
+            </view>
         </view>
-    </view>
+    <!--</view>-->
 </view>
\ No newline at end of file

@@ -2,7 +2,7 @@
 page {
     height: 100%;
     background-color: #f5f6f8;
-    overflow-y:hidden;
+    overflow-y:scroll;
 }
 ::-webkit-scrollbar {
     width: 0;
@@ -137,4 +137,9 @@ page {
     text-align: center;
     font-size: 28rpx;
     color: #666666;
+}
+.scroll-box {
+    overflow-y: scroll;
+    display: -webkit-box;
+    -webkit-overflow-scrolling: touch;
 }
\ No newline at end of file

@@ -255,23 +255,24 @@ Page({
                 }
             });
         } else {
-          console.log(self.data.is_answer, self.data.is_canSend, self.data.is_write)
-            if (+self.data.is_write == 2 && wx.getStorageSync('is_canSend') == 2) { //没填写个人信息并且不可以发布 =>去填写
+          // console.log(self.data.is_answer, self.data.is_canSend, self.data.is_write)
+          console.log(wx.getStorageSync('is_write'), wx.getStorageSync('is_answer'), wx.getStorageSync('is_canSend'))
+            if (wx.getStorageSync('is_write') == 2 && wx.getStorageSync('is_canSend') == 2) { //没填写个人信息并且不可以发布 =>去填写
                 self.setData({
                     is_showUserInfo: true //弹出 去填写个人信息弹框
                 });
 
-            } else if (+self.data.is_write == 1 && wx.getStorageSync('is_answer') == 2) { //已填写且不能发布=>去答题
+            } else if (wx.getStorageSync('is_write') == 1 && wx.getStorageSync('is_answer') == 2) { //已填写且不能发布=>去答题
                 self.setData({
                     is_showAnswer: true, //弹出 去答题弹框
                     is_showRelease: false,
                 });
-            } else if (+self.data.is_write == 1 && wx.getStorageSync('is_canSend') == 1 && wx.getStorageSync('is_answer') == 1) { //已填写且可以发布 =>去发布
+            } else if (wx.getStorageSync('is_write') == 1 && wx.getStorageSync('is_canSend') == 1 && wx.getStorageSync('is_answer') == 1) { //已填写且可以发布 =>去发布
                 // console.log('可以发布');
                 self.setData({
                     is_showRelease: true //弹出 发布弹框
                 });
-            } else if (self.data.is_write == 1 && wx.getStorageSync('is_canSend') == 2 && wx.getStorageSync('is_answer') == 1) {
+            } else if (wx.getStorageSync('is_write') == 1 && wx.getStorageSync('is_canSend') == 2 && wx.getStorageSync('is_answer') == 1) {
                 // wx.showToast({title: '等级不够，无法使用发布功能', icon: 'none'});
                 self.setData({
                     is_showResult: true //弹出 提示框

@@ -294,20 +294,20 @@ Page({
                 }
             });
         }else {
-            if (+self.data.is_write === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
+            if (wx.getStorageSync('is_write') === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
                 self.setData({
                     is_showUserInfo: true //弹出 去填写个人信息弹框
                 });
 
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
                 self.setData({
                     is_showAnswer: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
                 self.setData({
                     is_showRelease: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
                 // wx.showToast({title: '等级不够，无法使用发布功能', icon: 'none'});
                 self.setData({
                     is_showResult: true //弹出 提示框

@@ -4,9 +4,11 @@
 
         <view class="line"></view>
         <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
+        <!--sonType=1发布人，2拼餐/拼活动人-->
         <view class="state1">
             <view class="circle change"></view>
-            <text>已拍下</text>
+            <text wx:if="{{detail.sonType === 1}}">已发布</text>
+            <text wx:if="{{detail.sonType === 2}}">已加入</text>
         </view>
         <view class="state2">
             <!--{{detail.status === 4 ||detail.status === 5 || detail.status === 6||detail.status === 8?'change':''}}-->

@@ -263,20 +263,20 @@ Page({
                 }
             });
         }else {
-            if (+self.data.is_write === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
+            if (wx.getStorageSync('is_write') === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
                 self.setData({
                     is_showUserInfo: true //弹出 去填写个人信息弹框
                 });
 
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
                 self.setData({
                     is_showAnswer: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
                 self.setData({
                     is_showRelease: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
                 // wx.showToast({title: '等级不够，无法使用发布功能', icon: 'none'});
                 self.setData({
                     is_showResult: true //弹出 提示框

@@ -316,20 +316,20 @@ Page({
                 }
             });
         }else {
-            if (+self.data.is_write === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
+            if (wx.getStorageSync('is_write') === 2 && wx.getStorageSync('is_canSend') === 2) { //没填写个人信息并且不可以发布 =>去填写
                 self.setData({
                     is_showUserInfo: true //弹出 去填写个人信息弹框
                 });
 
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_answer') === 2) { //已填写且不能发布=>去答题
                 self.setData({
                     is_showAnswer: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 1 && wx.getStorageSync('is_answer') === 1) { //已填写且可以发布 =>去发布
                 self.setData({
                     is_showRelease: true //弹出 去答题弹框
                 });
-            } else if (+self.data.is_write === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
+            } else if (wx.getStorageSync('is_write') === 1 && wx.getStorageSync('is_canSend') === 2 && wx.getStorageSync('is_answer') === 1) {
                 // wx.showToast({title: '等级不够，无法使用发布功能', icon: 'none'});
                 self.setData({
                     is_showResult: true //弹出 提示框