Merge branch 'dev_des' of http://123.60.98.226:3000/jiazhipeng/EpicSoul into dev_des

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

static/js/request.js

@@ -9,8 +9,8 @@ const DEV_API_URL = 'http://1.13.193.49';
 const PROD_API_URL = 'http://1.13.193.49';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
 // const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
-// const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
+const DEV_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
-const DEV_API_URL_DES = 'http://192.168.124.8:8083/xcx';
+// const DEV_API_URL_DES = 'http://192.168.124.8:8083/xcx';
 // const PROD_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
 const PROD_API_URL_DES = 'https://des.dayunyuanjian.cn/xcx';
 const NEWAPIURL_DES = process.env.NODE_ENV === 'development' ? DEV_API_URL_DES : PROD_API_URL_DES;

subPackages/haveFeeling/list.vue

@@ -80,7 +80,8 @@
           <view class="order-info" >
             <view class="order-total-section">
               <!-- <text class="total-label">{{(order.status==0)?'':'实付'}}</text> -->
-              <text class="order-total">¥{{ order.payAmount || 0 }}</text>
+              <text class="order-total" v-if="order.orders&&order.orders.length==1">¥{{ order.orders[0].payAmount || 0 }}</text>
+			  <text class="order-total" v-else>¥{{ order.payAmount || 0 }}</text>
             </view>
             <view class="order-time">{{ order.createTime }}</view>
           </view>

subPackages/techan/order.vue

@@ -97,6 +97,7 @@
                 </view>
                 <view class="commodity-info">
                   <view class="text-overflowRows"
+				  style="width: 90%;"
                     >{{ sku.specValueOne }}-{{ sku.specValueTwo }}</view
                   >
                   <view class="commodity-num"> x{{ sku.quantity }} </view>