Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/order-commit.vue

@@ -21,14 +21,18 @@
               <view class="good-info">
                 <view class="good-name">{{x.GoodsName}}</view>
                 <view class="good-attr">
-                  <u-tag
-                    v-for="(y, yi) in x.SpecificationList"
-                    :key="yi"
+                  <u-tag v-if="x.CarColorName"
                     size="mini"
-                    :text="y"
+                    :text="x.CarColorName"
                     type="warning"
                   />
                 </view>
+				<view style="display: flex;align-items: center;font-size:12px;">
+					<text style="margin-right:5px;" v-if="x.CarName">车辆：<text>{{x.CarName}}</text></text>
+					<text style="margin-right:5px;" v-if="x.CarBrandName">品牌：<text>{{x.CarBrandName}}</text></text>
+					导游：<u-avatar mode="circle" style="margin-top:5px;" :size="50" :src="x.GuidePhoto"></u-avatar>
+					<text>{{x.GuideName}}</text>
+				</view>
               </view>
               <view class="op-box">
                 <u-button