Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelContractConfirm.vue

@@ -327,6 +327,7 @@
 
 <template>
     <div>
+
         <template v-if="CtObj.CType==1">
              <div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
                 <!-- 签字 -->
@@ -1490,7 +1491,7 @@
                         消费者协会投诉电话{{CtObj.C_XFZXHTSTel}}。
                         </p>
                         <p>协商或投诉调解不成的，按下列第 <font>{{CtObj.C_SolveType}}</font>种方式解决：</p>
-                        <p>1.将争议提交<span>&nbsp;&nbsp;\&nbsp;&nbsp;</span>仲裁委员会仲裁；</p>
+                        <p>1.将争议提交<font>{{CtObj.C_SolveRemark}}</font>仲裁委员会仲裁；</p>
                         <p>2.依法向人民法院提起民事诉讼。</p>
                         <h3>其他约定</h3>
                         <div style="border: 1px solid #000;min-height: 300px;padding:5px; ">

src/components/activity/pushManagement.vue

@@ -194,11 +194,11 @@ export default {
     return {
       modeList: [
         {
-          name: "小程序",
+          name: "APP",
           id: 1
         },
         {
-          name: "APP",
+          name: "小程序",
           id: 2
         }
       ],