Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/UserMan/tinyMerchant/tinyMerchantSet.vue

@@ -122,7 +122,7 @@
                 <el-button slot="append">元</el-button>
               </el-input>
             </el-form-item>
-            <el-form-item class="discount commonLabel" label="每次提现上限" prop="MaxWithdrawal">
+            <el-form-item class="discount commonLabel" label="每日提现上限" prop="MaxWithdrawal">
               <el-tooltip class="item" effect="dark" content="-1元表示不限制每日提现金额" placement="top-start">
                 <i class=" elzk el-tooltip el-icon-info"></i>
               </el-tooltip>

src/components/orderMan/orderList.vue

@@ -108,6 +108,9 @@
                 <div class="app-order-user">
                   <span class="app-order-time">订单号：</span>{{item.OrderNo}}({{item.OrderId}})
                 </div>
+                <div class="app-order-user" v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 ">
+                  <span class="app-order-time">微店名称：</span>{{item.SmallShopsName}}
+                </div>
                 <div flex="cross:center" class="app-order-user">
                   <img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
                   <span>{{item.UserName}}({{item.UserId}})</span>
@@ -177,6 +180,10 @@
                           </el-tag>
                         </span>
                       </div>
+                      <div  style=" display: flex;flex-direction: row;align-items: center;" v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
+                        <span>微店价格：￥{{list.Final_Price}}</span>
+
+                      </div>
                       <div  style=" display: flex;flex-direction: row;align-items: center;">
                         <span>货号：{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
                         <span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>

src/components/sallCenter/couponManage.vue

@@ -43,6 +43,10 @@
           prop="Name"
           label="优惠券名称">
         </el-table-column>
+        <el-table-column
+          prop="SmallShopName"
+          label="微店名称">
+        </el-table-column>
         <el-table-column
           prop="MinConsumePrice"
           label="最低消费金额（元）"