Merge branch 'standard1' of http://47.97.1.152:5880/r/wms_app into standard1

whycq

2023-08-22 9d3f160ad34f18bff7e0e40e551e07f30a68d2a9

Merge branch 'standard1' of http://47.97.1.152:5880/r/wms_app into standard1

 manifest.json

@@ -1,5 +1,5 @@
{
    "name" : "中扬WMS",
    "name" : "蓝科途WMS",
    "appid" : "__UNI__DA5854D",
    "description" : "",
    "versionName" : "2023063001",

 pages/login/login.vue

@@ -9,7 +9,7 @@
        <!-- logo -->
        <view class="logo">
            <view class="logo-box">
                <image src="../../static/img/logo.png" mode="aspectFit"></image>
                <image src="../../static/img/LkyLogo.jpg" mode="aspectFit"></image>
            </view>
        </view>
        <view class="content">

 pages/order/orderPakin.vue

@@ -52,12 +52,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量：</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -92,10 +92,10 @@
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

 pages/order/orderPutDown.vue

@@ -50,12 +50,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量：</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

 pages/order/orderPutOn.vue

@@ -50,12 +50,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量：</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

 pages/pakin/pakin.vue

@@ -46,12 +46,12 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                    <!-- <view class="list-left-item">
                        <view class="desc">重量：</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -86,10 +86,10 @@
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

 static/img/LkyLogo.jpg

 unpackage/res/icons/1024x1024.png

 unpackage/res/icons/120x120.png

 unpackage/res/icons/144x144.png

 unpackage/res/icons/152x152.png

 unpackage/res/icons/167x167.png

 unpackage/res/icons/180x180.png

 unpackage/res/icons/192x192.png

 unpackage/res/icons/20x20.png

 unpackage/res/icons/29x29.png

 unpackage/res/icons/40x40.png

 unpackage/res/icons/58x58.png

 unpackage/res/icons/60x60.png

 unpackage/res/icons/72x72.png

 unpackage/res/icons/76x76.png

 unpackage/res/icons/80x80.png

 unpackage/res/icons/87x87.png

 unpackage/res/icons/96x96.png