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

src/components/FinancialModule/groupApproval.vue

@@ -109,7 +109,7 @@
                     <template slot-scope="scope">
                         {{scope.row.SaleCommission}}
                         <p v-if="scope.row.SaleCommission>0&&scope.row.ConfigID>0&&scope.row.Config_OfferId>0" 
-                            style="cursor: pointer;text-decoration: underline;color: #33B3FF;" 
+                            style="cursor: pointer;text-decoration: underline;color: #33B3FF;font-size: 12px;" 
                         @click="showDialog(scope.row.ConfigID, scope.row.Config_OfferId)">报价详情</p>
                     </template>
                 </el-table-column>

src/components/SalesModule/enrollTotal.vue

@@ -312,6 +312,12 @@
                   countData.DueinMoney
                 }};</span
               >
+              <span>应收小费：
+                {{countData.PreferTipAmount}}
+              </span>
+              <span>实收小费：
+                {{countData.CompensationMoney}}
+              </span>
               <span>{{ $t("fnc.ztjine") }}：{{ countData.ZaiTu }};</span>
             </p>
           </div>
@@ -1760,7 +1766,7 @@ export default {
 }
 
 .groupTourOrder_count_col {
-  height: 80px;
+  height: 95px;
 }
 
 .groupTourOrder_count_item {

src/plug/index.js

@@ -131,7 +131,7 @@ export default {
         mallUrl = "http://192.168.20.13:8088";
         lxymallUrl = "http://192.168.20.13:8088";
         // crmUrl = "http://192.168.10.36:8098"
-        // crmUrl = "http://192.168.10.11:8098"
+        // crmUrl = "http://192.168.10.9:8098"
         crmUrl = "http://crm.oytour.com"
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";