Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-base-select/pages/select-goods/select-goods.wxml

@@ -18,7 +18,7 @@
 <van-dialog id="van-dialog" />
 <van-sticky offset-top="{{ 0 }}">
   <!-- <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" /> -->
-  <dk-navbar titleFontColor="#000000" navbarTitle="选择商品" bind:clickBack="onClickLeft" operateShow="{{false}}" bind:getNavbarHeight="getNavbarHeight"/>
+  <dk-navbar titleFontColor="#000000" navbarTitle="选择商品" bind:clickBack="onClickLeft" operateShow="{{false}}" bind:getNavbarHeight="getNavbarHeight" />
 
   <view style="display: flex;">
     <view style="width: 85%;">
@@ -26,8 +26,13 @@
       <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
       </dk-dropdown-menu>
     </view>
-    <view bind:tap="toAddGoods" class="scan-class" style="width: 15%;display: flex;align-items: center;">
-      <image class="scan-image" fit="fill" src="{{imageUrl+'/goods_add_icon.png'}}"></image>
+    <view bind:tap="toAddGoods" class="scan-class">
+      <view  class="scan-background-class">
+        <view>
+          <image class="scan-image" fit="fill" src="{{imageUrl+'/goods_add_icon_2.png'}}"></image>
+        </view>
+        <view style="font-size: 12px;padding-left: 10rpx;">{{item == 'sale' || item == 'saleOutReturn' || billType=='purInto' ? '建商品' : '去入库'}}</view>
+      </view>
     </view>
   </view>
 
@@ -290,7 +295,7 @@
                   </view>
                 </view>
               </view>
-            </view> 
+            </view>
             <!-- 库存盘点显示的 -->
             <view wx:if="{{controlFlags&&controlFlags.sourcePage =='inventory-check'}}">
               <!-- 库存量  可售量 -->
@@ -419,4 +424,4 @@
 </dk-single-dropdown-item>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"stepperDecimal="decimalPlaces"></dk-popup>
+<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces"></dk-popup>

package-base-select/pages/select-goods/select-goods.wxss

@@ -157,10 +157,26 @@ page {
   color: #000 !important;
 }
 .scan-image {
-  width: 50rpx;
-  height: 50rpx;
+  width: 30rpx;
+  height: 30rpx;
+  color: #fff;
+}
+.scan-class{
+  width: 24%;
+  display: flex;
+  align-items: center;
+  margin-right: 12rpx;
+}
+.scan-background-class{
+  display: flex;
+  align-items: center;
+  background-color: #3E69F6;
+  border-radius: 16rpx;
+  padding:10rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  color: #fff;
 }
-
 .width-80 {
   width: 100%;
 }

pages/shopping/shopping.wxml

@@ -13,9 +13,20 @@
       </dk-dropdown-menu>
 </view>
 
-  <view bind:tap="toAddOtherWarehousing" class="scan-class" style="width: 15%;display: flex;align-items: center;">
+
+<view bind:tap="toAddOtherWarehousing" class="scan-class">
+      <view  class="scan-background-class">
+        <view>
+          <image class="scan-image" fit="fill" src="{{imageUrl+'/goods_add_icon_2.png'}}"></image>
+        </view>
+        <view style="font-size: 12px;padding-left: 10rpx;">去入库</view>
+      </view>
+    </view>
+
+
+  <!-- <view bind:tap="toAddOtherWarehousing" class="scan-class" style="width: 15%;display: flex;align-items: center;">
     <image class="scan-image" fit="fill" src="{{imageUrl+'/goods_add_icon.png'}}"></image>
-  </view>
+  </view> -->
 </view>
 
 

pages/shopping/shopping.wxss

@@ -132,8 +132,25 @@ page{
   border-radius: 0px 16px 0px 0px;
 }
 .scan-image {
-  width: 50rpx;
-  height: 50rpx;
+  width: 30rpx;
+  height: 30rpx;
+  color: #fff;
+}
+.scan-class{
+  width: 24%;
+  display: flex;
+  align-items: center;
+  margin-right: 12rpx;
+}
+.scan-background-class{
+  display: flex;
+  align-items: center;
+  background-color: #3E69F6;
+  border-radius: 16rpx;
+  padding:10rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  color: #fff;
 }
 .width-80{
   width:100%;