18016688350 4 anos atrás
pai
commit
5df7e9d7a7

+ 2 - 2
pages/accountBind/index.wxml

@@ -81,7 +81,7 @@
   <tui-list-cell hover="{{false}}">
     <view class="tui-line-cell">
       <view class="tui-title">门店合作电话</view>
-      <input placeholder-class="phcolor" class="tui-input" catchinput="inputedit" value="{{userInfo.hotelPhone}}" data-name="userInfo.hotelPhone" 
+      <input placeholder-class="phcolor" class="tui-input" catchinput="inputedit" value="{{userInfo.storePhone}}" data-name="userInfo.storePhone" 
       placeholder="请输入门店合作电话" type="text" />
     </view>
   </tui-list-cell>
@@ -91,7 +91,7 @@
     <view class="tui-line-cell">
       <view class="tui-title">门店合作名片:</view>
       <view class="tui-lable">
-        <tui-upload serverUrl="{{userInfo.hotelCooperate}}" catchinput="inputedit"   data-name="userInfo.hotelCooperate"  bind:complete="result"></tui-upload>
+        <tui-upload serverUrl="{{userInfo.storeCooperate}}" catchinput="inputedit"   data-name="userInfo.storeCooperate"  bind:complete="result"></tui-upload>
       </view>
     </view>
   </tui-list-cell>

+ 3 - 3
pages/contractTime/index.js

@@ -10,7 +10,7 @@ Page({
     searchParams:{
       storeName:'',
     },
-    hotelList:[],
+    storeList:[],
   },
 
   /**
@@ -70,10 +70,10 @@ Page({
   },
   bindHotelList(){
     var that = this
-    util.request(util.api.hotelInfo, that.data.searchParams, "GET", false, true,app.globalData.token).then((res)=>{
+    util.request(util.api.storeInfo, that.data.searchParams, "GET", false, true,app.globalData.token).then((res)=>{
       if (res.code == 200) {
         that.setData({
-          hotelList: res.result,
+          storeList: res.result,
         })
       }
     }).catch((res) => {})

+ 6 - 6
pages/contractTime/index.wxml

@@ -2,24 +2,24 @@
   <view class="cu-bar search bg-white margin-bottom-xs">
     <view class="search-form round">
       <text class="cuIcon-search"></text>
-      <input type="text" placeholder="输入门店名称" confirm-type="search" data-name="searchParams.hotelName" catchinput="inputedit"></input>
+      <input type="text" placeholder="输入门店名称" confirm-type="search" data-name="searchParams.storeName" catchinput="inputedit"></input>
     </view>
     <view class="action">
       <button class="cu-btn bg-blue shadow-blur round" bindtap="searchHotel">搜索</button>
     </view>
   </view>
-  <block wx:for="{{hotelList}}">
+  <block wx:for="{{storeList}}">
   <tui-cell bind:click="detail" tui-cell-class="tui-msg">
     <view class="tui-msg-box">
       <image src="../../static/images/my/mine_def_touxiang_3x.png" class="tui-msg-pic"></image>
       <view class="tui-msg-item">
-        <view class="tui-msg-name">{{item.hotelName}}</view>
-        <view class="tui-msg-content">{{item.hotelPrincipalPhone}}</view>
+        <view class="tui-msg-name">{{item.storeName}}</view>
+        <view class="tui-msg-content">{{item.storePrincipalPhone}}</view>
       </view>
     </view>
     <view class="tui-msg-right">
-      <view class="tui-msg-time">开始时间:{{item.hotelContractStart}}</view>
-      <view class="tui-msg-time">结束时间:{{item.hotelContractEnd}}</view>
+      <view class="tui-msg-time">开始时间:{{item.storeContractStart}}</view>
+      <view class="tui-msg-time">结束时间:{{item.storeContractEnd}}</view>
     </view>
   </tui-cell>
 </block>

+ 1 - 1
pages/device/detail.wxml

@@ -16,7 +16,7 @@
   <tui-list-cell hover="{{false}}">
     <view class="tui-line-cell">
       <view class="tui-title">门店名称:</view>
-      <label class="tui-label">{{item.mgVmDevice.hotelName}}</label>
+      <label class="tui-label">{{item.mgVmDevice.storeName}}</label>
     </view>
   </tui-list-cell>
   <tui-list-cell hover="{{false}}">

+ 6 - 6
pages/device/index.wxss

@@ -6,31 +6,31 @@ page{
 .container{
   height: 100%;
 }
-.hotel-grid{
+.store-grid{
   height: 100%;
 }
-.hotel-list-row{
+.store-list-row{
   display: flex;
   align-items: center;
   position: relative;
 }
-.hotel-list-row .hotel-name{
+.store-list-row .store-name{
   font-weight: 600;
 }
 
-.hotel-list-row .hotel-mobile{
+.store-list-row .store-mobile{
   font-size:24rpx;
   color:#999;
 }
 
-.hotel-list-row .hotel-img{
+.store-list-row .store-img{
   float:right;
   flex-direction: column;
   align-items: center;
   height:100rpx;
   width:100rpx;
 }
-.hotel-list-row .hotel-img image{
+.store-list-row .store-img image{
   height:100rpx;
   width:100rpx;
 }

+ 1 - 1
pages/index/index.wxml

@@ -30,7 +30,7 @@
           实际收款(元)
         </view>
         <view class="padding-xs" wx:if="{{userInfo.mgvmRole==2}}">
-          {{statisData.hotelCommission==null?0:statisData.hotelCommission/100}}
+          {{statisData.storeCommission==null?0:statisData.storeCommission/100}}
         </view>
         <view class="padding-xs" wx:if="{{userInfo.mgvmRole==3}}">
           {{statisData.agentMoney==null?0:statisData.agentMoney/100}}

+ 2 - 2
pages/orderGoods/order.wxml

@@ -29,11 +29,11 @@
         </tui-list-cell>
       </view>
       <view class="tui-search-model-item">
-        <picker bindchange="bindHotelPickerChange" value="{{index}}" range="{{hotelList}}" range-key="hotelName">
+        <picker bindchange="bindHotelPickerChange" value="{{index}}" range="{{storeList}}" range-key="storeName">
           <tui-list-cell hover="{{false}}">
             <view class="tui-line-cell">
               <view class="tui-title">门店</view>
-              <input placeholder-class="phcolor" class="tui-input" placeholder="请选择门店" type="text" disabled="true" value="{{searchParams.hotelName}}" catchinput="inputedit" data-name="searchParams.hotelId"/>
+              <input placeholder-class="phcolor" class="tui-input" placeholder="请选择门店" type="text" disabled="true" value="{{searchParams.storeName}}" catchinput="inputedit" data-name="searchParams.storeId"/>
             </view>
           </tui-list-cell>
         </picker>

+ 2 - 2
pages/orderGoods/submitBuy.js

@@ -14,7 +14,7 @@ Page({
       receiverPhone:'',
       receiverArea:'',
       recevierAddress:'',
-      hotelId:'',
+      storeId:'',
       productOrderDetailList:[]
     },
     area: [0, 0, 0],
@@ -27,7 +27,7 @@ Page({
    */
   onLoad: function (options) {
 
-    this.data.values.hotelId = options.hotelId
+    this.data.values.storeId = options.storeId
     if(options && options.strJson){
       var list =  JSON.parse(decodeURIComponent(options.strJson))
       var totalPrice = 0

+ 1 - 1
pages/product/edit.js

@@ -197,7 +197,7 @@ Page({
     }
 
     if (dataset.type && dataset.type == 'float') {
-      value = parseInt(parseFloat(value)*100);
+      value = parseInt(parseFloat(value));
       _this.data[name] = value;
     } else {
       _this.data[name] = value;

+ 1 - 1
pages/product/select.js

@@ -58,7 +58,7 @@ Page({
       ["searchParams.pageNo"]: 1,
       pullUpOn: true,
       loadding: false,
-      hotelList: []
+      storeList: []
     })
     this.bindProductList()
     setTimeout(() => {

+ 5 - 5
pages/role/introducerList.wxml

@@ -10,16 +10,16 @@
     </view>
   </view>
 
-  <view class="bg-white hotel-grid">
+  <view class="bg-white store-grid">
     <view class="grid col-2">
       <block wx:for="{{introducerList}}">
       <view>
-        <view class="margin-xs padding-sm radius shadow-warp hotel-list-row" bindtap="toEdit" data-id="{{item.id}}">
+        <view class="margin-xs padding-sm radius shadow-warp store-list-row" bindtap="toEdit" data-id="{{item.id}}">
           <view style="width:100%;">
-            <view class="padding-bottom-sm hotel-name">{{item.realname}}</view>
-            <view class="hotel-mobile">{{item.telephone}}</view>
+            <view class="padding-bottom-sm store-name">{{item.realname}}</view>
+            <view class="store-mobile">{{item.telephone}}</view>
           </view>
-          <view class="hotel-img">
+          <view class="store-img">
             <image src="../../static/images/my/mine_def_touxiang_3x.png"></image>
           </view>
         </view>

+ 6 - 6
pages/role/introducerList.wxss

@@ -5,31 +5,31 @@ page{
 .container{
   height: 100%;
 }
-.hotel-grid{
+.store-grid{
   height: 100%;
 }
-.hotel-list-row{
+.store-list-row{
   display: flex;
   align-items: center;
   position: relative;
 }
-.hotel-list-row .hotel-name{
+.store-list-row .store-name{
   font-weight: 600;
 }
 
-.hotel-list-row .hotel-mobile{
+.store-list-row .store-mobile{
   font-size:24rpx;
   color:#999;
 }
 
-.hotel-list-row .hotel-img{
+.store-list-row .store-img{
   float:right;
   flex-direction: column;
   align-items: center;
   height:100rpx;
   width:100rpx;
 }
-.hotel-list-row .hotel-img image{
+.store-list-row .store-img image{
   height:100rpx;
   width:100rpx;
 }

+ 5 - 5
pages/role/operationList.wxml

@@ -10,16 +10,16 @@
     </view>
   </view>
 
-  <view class="bg-white hotel-grid">
+  <view class="bg-white store-grid">
     <view class="grid col-2">
       <block wx:for="{{operationList}}">
       <view>
-        <view class="margin-xs padding-sm radius shadow-warp hotel-list-row" bindtap="toEdit" data-id="{{item.id}}">
+        <view class="margin-xs padding-sm radius shadow-warp store-list-row" bindtap="toEdit" data-id="{{item.id}}">
           <view style="width:100%;">
-            <view class="padding-bottom-sm hotel-name">{{item.realname}}</view>
-            <view class="hotel-mobile">{{item.telephone}}</view>
+            <view class="padding-bottom-sm store-name">{{item.realname}}</view>
+            <view class="store-mobile">{{item.telephone}}</view>
           </view>
-          <view class="hotel-img">
+          <view class="store-img">
             <image src="../../static/images/my/mine_def_touxiang_3x.png"></image>
           </view>
         </view>

+ 6 - 6
pages/role/operationList.wxss

@@ -5,31 +5,31 @@ page{
 .container{
   height: 100%;
 }
-.hotel-grid{
+.store-grid{
   height: 100%;
 }
-.hotel-list-row{
+.store-list-row{
   display: flex;
   align-items: center;
   position: relative;
 }
-.hotel-list-row .hotel-name{
+.store-list-row .store-name{
   font-weight: 600;
 }
 
-.hotel-list-row .hotel-mobile{
+.store-list-row .store-mobile{
   font-size:24rpx;
   color:#999;
 }
 
-.hotel-list-row .hotel-img{
+.store-list-row .store-img{
   float:right;
   flex-direction: column;
   align-items: center;
   height:100rpx;
   width:100rpx;
 }
-.hotel-list-row .hotel-img image{
+.store-list-row .store-img image{
   height:100rpx;
   width:100rpx;
 }

+ 1 - 1
pages/scheme/form.js

@@ -164,7 +164,7 @@ Page({
     }
     switch(name){
       case "productSchemePrice":
-        value = parseInt(parseFloat(value)*100);
+        value = parseInt(parseFloat(value));
         itemProduct.productSchemePrice = value
         break;
       case "storeDivide":

+ 1 - 1
pages/scheme/index.wxml

@@ -26,7 +26,7 @@
 
   <!--list-->
   <view class="bg-white store-grid">
-    <view class="grid col-2">
+    <view class="grid col-2" >
       <view wx:for="{{schemeList}}">
         <view class="margin-xs padding-sm radius shadow-warp store-list-row" bindtap="toEdit" data-id="{{item.id}}">
           <view style="width:100%;">

+ 6 - 6
pages/scheme/index.wxss

@@ -149,32 +149,32 @@ page{
 	}
 /**list**/
 
-.hotel-grid{
+.store-grid{
   margin-top: 200rpx;
   height: 100%;
 }
-.hotel-list-row{
+.store-list-row{
   display: flex;
   align-items: center;
   position: relative;
 }
-.hotel-list-row .hotel-name{
+.store-list-row .store-name{
   font-weight: 600;
 }
 
-.hotel-list-row .hotel-mobile{
+.store-list-row .store-mobile{
   font-size:24rpx;
   color:#999;
 }
 
-.hotel-list-row .hotel-img{
+.store-list-row .store-img{
   float:right;
   flex-direction: column;
   align-items: center;
   height:100rpx;
   width:100rpx;
 }
-.hotel-list-row .hotel-img image{
+.store-list-row .store-img image{
   height:100rpx;
   width:100rpx;
 }

+ 2 - 2
pages/scheme/select.js

@@ -100,7 +100,7 @@ Page({
     var list = prevPage.data.values.schemeProductList
     var itemProduct = JSON.parse(JSON.stringify(list))[this.data.index]
     itemProduct.productId = row.id
-    itemProduct.productName = row.productName
+    itemProduct.productName = row.skuProductName
     itemProduct.productImg = row.productImg
     itemProduct.productSchemePrice = row.productSellPrice
     itemProduct.storeDivide = 30
@@ -112,7 +112,7 @@ Page({
   },
   bindProductList() {
     var that = this
-    util.request(util.api.vmProductListPage, that.data.searchParams, "GET", false, false, app.globalData.token).then((res) => {
+    util.request(util.api.MgVmProductSkuPage, that.data.searchParams, "GET", false, false, app.globalData.token).then((res) => {
       if (res.code == 200) {
         if (res.result.records.length > 0) {
           if (that.data.productList.length > 0) {

+ 2 - 2
pages/scheme/select.wxml

@@ -5,7 +5,7 @@
     <view class="cu-bar search bg-white">
       <view class="search-form round">
         <text class="cuIcon-search"></text>
-        <input type="text" placeholder="输入商品名称" confirm-type="search" value="{{searchParams.productName}}" data-name="searchParams.productName" catchinput="inputedit" bindblur="inputedit"></input>
+        <input type="text" placeholder="输入商品名称" confirm-type="search" value="{{searchParams.skuProductName}}" data-name="searchParams.skuProductName" catchinput="inputedit" bindblur="inputedit"></input>
       </view>
       <view class="action">
         <button class="cu-btn bg-blue shadow-blur round" bindtap="btnSearch">搜索</button>
@@ -20,7 +20,7 @@
         <view class="tui-goods-item">
           <image src="{{item.productImg}}" class="tui-goods-img"></image>
           <view class="tui-goods-center">
-            <view class="tui-goods-name">{{item.productName}}</view>
+            <view class="tui-goods-name">{{item.skuProductName}}</view>
             <view class="tui-goods-attr">商品进货价(元):<text style="color:red;">¥{{filter.toDecimal2Penny(item.productPrice)}}</text></view>
             <view class="tui-goods-attr">商品售价(元):<text style="color:red;">¥{{filter.toDecimal2Penny(item.productSellPrice)}}</text></view>
             <view class="tui-goods-attr">商品应用格子:

+ 2 - 2
pages/scheme/sync.wxml

@@ -30,8 +30,8 @@
     <view class="grid col-2">
       <view wx:for="{{deviceList}}">
         <view  class="cu-tag radius margin-xs padding {{item.checkout? 'bg-blue':'line-blue'}}" bindtap="syncChecked" data-index="{{index}}" data-item="{{item}}" >
-          <view wx-if="{{item.colorType!=1}}">{{item.deviceLocation}}  </view>
-          <view wx-if="{{item.colorType==1}}" style="color:red">{{item.deviceLocation}}  </view>
+          <view wx-if="{{item.colorType!=1}}">{{item.deviceName}}  </view>
+          <view wx-if="{{item.colorType==1}}" style="color:red">{{item.deviceName}}  </view>
         </view>
       </view>
     </view>

+ 15 - 11
pages/stock/index.js

@@ -6,10 +6,10 @@ Page({
    * 页面的初始数据
    */
   data: {
-    hotelList: [],
+    storeList: [],
     searchParams: {
-      hotelId: '',
-      hotelName: '',
+      storeId: '',
+      storeName: '',
     },
     stockList: []
   },
@@ -18,32 +18,33 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.bindHotelList()
+    this.bindStoreList()
     this.bindProductStockList()
   },
 
-  bindHotelPickerChange: function (e) {
-    var item = this.data.hotelList[e.detail.value]
+  bindStorePickerChange: function (e) {
+    var item = this.data.storeList[e.detail.value]
     console.log(item)
     this.setData({
-      ['searchParams.hotelName']: item.hotelName,
-      ['searchParams.hotelId']: item.id
+      ['searchParams.storeName']: item.storeName,
+      ['searchParams.storeId']: item.id
     })
     this.bindProductStockList()
 
   },
-  bindHotelList() {
+  bindStoreList() {
     var that = this
-    util.request(util.api.hotelList, {}, "GET", false, true, app.globalData.token).then((res) => {
+    util.request(util.api.storeList, {}, "GET", false, true, app.globalData.token).then((res) => {
       if (res.code == 200) {
         that.setData({
-          hotelList: res.result
+          storeList: res.result
         })
       }
     }).catch((res) => {})
   },
   formSubmit: function (e) {
     var that = this
+    console.log(that.data.stockList)
     util.request(util.api.editVmProductStock, that.data.stockList, "POST", false, true, app.globalData.token).then((res) => {
       if (res.code == 200) {
         util.toast('保存成功')
@@ -74,6 +75,8 @@ Page({
     var list = that.data.stockList
     var index = dataset.index;
     var itemProduct = dataset.item
+    console.log(name)
+    console.log(itemProduct)
     itemProduct.skuStock = value
     list.splice(index, 1, itemProduct)
     that.setData({
@@ -83,6 +86,7 @@ Page({
   bindProductStockList() {
     var that = this
     util.request(util.api.productStockList, that.data.searchParams, "GET", true, true, app.globalData.token).then((res) => {
+      console.log(res)
       if (res.code == 200) {
         that.setData({
           stockList: res.result

+ 2 - 2
pages/stock/index.wxml

@@ -2,12 +2,12 @@
 <view class="container">
 
   <form bindsubmit="formSubmit" bindreset="formReset">
-    <picker bindchange="bindHotelPickerChange" value="{{index}}" range="{{hotelList}}" range-key="hotelName">
+    <picker bindchange="bindStorePickerChange" value="{{index}}" range="{{storeList}}" range-key="storeName">
       <tui-list-cell hover="{{false}}">
         <view class="tui-line-cell">
           <view class="tui-title">门店</view>
           <input placeholder-class="phcolor" class="tui-input" placeholder="请选择门店" type="text" disabled="true"
-            value="{{searchParams.hotelName}}" />
+            value="{{searchParams.storeName}}" />
         </view>
       </tui-list-cell>
     </picker>

+ 12 - 12
pages/stock/replenish.js

@@ -10,9 +10,9 @@ Page({
     searchParams:{
       pageNo:1,
       pageSize:10,
-      hotelName:'',
+      storeName:'',
     },
-    hotelList:[],
+    storeList:[],
     loadding: false,
     pullUpOn: true,
   },
@@ -21,7 +21,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.bindHotelList()
+    this.bindStoreList()
   },
 
   /**
@@ -57,9 +57,9 @@ Page({
       ["searchParams.pageNo"]: 1,
       pullUpOn: true,
       loadding: false,
-      hotelList: []
+      storeList: []
     })
-    this.bindHotelList()
+    this.bindStoreList()
     setTimeout(() => {
       wx.stopPullDownRefresh()
     }, 300);
@@ -78,7 +78,7 @@ Page({
     this.setData({
       ["searchParams.pageNo"]: that.data.searchParams.pageNo + 1
     })
-    this.bindHotelList()
+    this.bindStoreList()
   },
 
   onPageScroll(e) {
@@ -95,27 +95,27 @@ Page({
   },
   toDetail(e){
     wx.navigateTo({
-      url: '/pages/stock/replenishDetail?hotelId='+e.currentTarget.dataset.id,
+      url: '/pages/stock/replenishDetail?storeId='+e.currentTarget.dataset.id,
     })
   },
 
-  bindHotelList(){
+  bindStoreList(){
     var that = this
-    util.request(util.api.hotelListPage, that.data.searchParams, "GET", false, true,app.globalData.token).then((res)=>{
+    util.request(util.api.storeListPage, that.data.searchParams, "GET", false, true,app.globalData.token).then((res)=>{
       if (res.code == 200) {
         if (res.result.records.length > 0) {
-          if (that.data.hotelList.length > 0) {
+          if (that.data.storeList.length > 0) {
             let list = that.data.productList
             var records = res.result.records
             records.forEach(record => {
               list.push(record)
             });
             that.setData({
-              hotelList: list
+              storeList: list
             })
           } else {
             that.setData({
-              hotelList: res.result.records
+              storeList: res.result.records
             })
           }
         } else {

+ 6 - 6
pages/stock/replenish.wxml

@@ -1,14 +1,14 @@
 <view class="container">
-  <view class="bg-white hotel-grid">
+  <view class="bg-white store-grid">
     <view class="grid col-2">
-      <block wx:for="{{hotelList}}">
+      <block wx:for="{{storeList}}">
       <view>
-        <view class="margin-xs padding-sm radius shadow-warp hotel-list-row" bindtap="toDetail" data-id="{{item.id}}">
+        <view class="margin-xs padding-sm radius shadow-warp store-list-row" bindtap="toDetail" data-id="{{item.id}}">
           <view style="width:100%;">
-            <view class="padding-bottom-sm hotel-name">{{item.hotelName}}</view>
-            <view class="hotel-mobile">{{item.hotelTel}}</view>
+            <view class="padding-bottom-sm store-name">{{item.storeName}}</view>
+            <view class="store-mobile">{{item.storeTel}}</view>
           </view>
-          <view class="hotel-img">
+          <view class="store-img">
             <image src="../../static/images/my/ico_hotel@3x.png"></image>
           </view>
         </view>

+ 6 - 6
pages/stock/replenish.wxss

@@ -6,31 +6,31 @@ page{
 .container{
   height: 100%;
 }
-.hotel-grid{
+.store-grid{
   height: 100%;
 }
-.hotel-list-row{
+.store-list-row{
   display: flex;
   align-items: center;
   position: relative;
 }
-.hotel-list-row .hotel-name{
+.store-list-row .store-name{
   font-weight: 600;
 }
 
-.hotel-list-row .hotel-mobile{
+.store-list-row .store-mobile{
   font-size:24rpx;
   color:#999;
 }
 
-.hotel-list-row .hotel-img{
+.store-list-row .store-img{
   float:right;
   flex-direction: column;
   align-items: center;
   height:100rpx;
   width:100rpx;
 }
-.hotel-list-row .hotel-img image{
+.store-list-row .store-img image{
   height:100rpx;
   width:100rpx;
 }

+ 3 - 3
pages/stock/replenishDetail.js

@@ -8,7 +8,7 @@ Page({
    */
   data: {
     deviceSn:'',
-    hotelId:'',
+    storeId:'',
     deviceInfo:{
       deviceDetail:{
         mgVmDevice:{},
@@ -23,7 +23,7 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      hotelId: options.hotelId
+      storeId: options.storeId
     })
     this.bindDevice()
   },
@@ -50,7 +50,7 @@ Page({
   },
   bindDevice(){
     var that = this
-    util.request(util.api.stockDeviceList, {hotelId:that.data.hotelId,deviceSn:that.data.deviceSn}, "GET", false, true,app.globalData.token).then((res)=>{
+    util.request(util.api.stockDeviceList, {storeId:that.data.storeId,deviceSn:that.data.deviceSn}, "GET", false, true,app.globalData.token).then((res)=>{
       if (res.code == 200) {
         that.setData({
           deviceInfo: res.result,

+ 1 - 1
pages/stock/stockDeviceDetail.wxml

@@ -16,7 +16,7 @@
   <tui-list-cell hover="{{false}}">
     <view class="tui-line-cell">
       <view class="tui-title">门店名称:</view>
-      <label class="tui-label">{{item.mgVmDevice.hotelName}}</label>
+      <label class="tui-label">{{item.mgVmDevice.storeName}}</label>
     </view>
   </tui-list-cell>
   <tui-list-cell hover="{{false}}">

+ 1 - 1
utils/filter.wxs

@@ -4,7 +4,7 @@ var toDecimal2Penny = function (x) {
   if (isNaN(f)) {
     return false;
   }
-  var f = Math.round(x * 100) / 10000;
+  var f = Math.round(x * 100) / 100;
   var s = f.toString();
   var rs = s.indexOf('.');
   if (rs < 0) {

+ 2 - 2
utils/util.js

@@ -204,8 +204,8 @@ const utils = {
     editStore: 'mgvm/mgVmStoreApi/editStore',
     stockDeviceList: 'api/device/stockDeviceList',
     upDevice:'api/device/upDeviceByStoreIdAnddevnceSn',
-    productStockList: 'mgvm/mgVmProductApi/productStockList',
-    editVmProductStock: 'mgvm/mgVmProductApi/editVmProductStock',
+    productStockList: 'mgvm/mgVmStoreProductSkuApi/productStockList',
+    editVmProductStock: 'mgvm/mgVmStoreProductSkuApi/editVmProductStock',
     addMerchantOrder: 'mgvm/mgSysProductOrder/addMerchantOrder',
     deviceListByStoreId: 'api/device/deviceListByStoreId',
     productOrderListPage: 'mgvm/mgSysProductOrder/productOrderListPage',