gaoluyang
8 天以前 536b053bbd574bab1b5179eccb962c3ad322c382
双奇点:
1.app仓储物流字段调整
已修改3个文件
394 ■■■■■ 文件已修改
src/manifest.json 216 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/components/GoodsDetailPopup.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index.vue 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/manifest.json
@@ -1,106 +1,124 @@
{
    "name" : "双奇点",
    "appid" : "__UNI__E1C100D",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
        "usingComponents" : true,
        "nvueStyleCompiler" : "uni-app",
        "compilerVersion" : 3,
        "splashscreen" : {
            "alwaysShowBeforeRender" : true,
            "waiting" : true,
            "autoclose" : true,
            "delay" : 0
        },
        /* 模块配置 */
        "modules" : {},
        /* 应用发布信息 */
        "distribute" : {
            /* android打包配置 */
            "android" : {
                "permissions" : [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                ]
            },
            /* ios打包配置 */
            "ios" : {
                "dSYMs" : false
            },
            /* SDK配置 */
            "sdkConfigs" : {},
  "name" : "信息管理",
  "appid" : "__UNI__E1C100D",
  "description" : "",
  "versionName" : "1.0.0",
  "versionCode" : "100",
  "transformPx" : false,
  /* 5+App特有相关 */
  "app-plus" : {
    "compatible" : {
      "usingComponents" : true,
      "ignoreVersion" : true
    },
    "usingComponents" : true,
    "nvueStyleCompiler" : "uni-app",
    "compilerVersion" : 3,
    "splashscreen" : {
      "alwaysShowBeforeRender" : true,
      "waiting" : true,
      "autoclose" : true,
      "delay" : 0
    },
    /* 模块配置 */
    "modules" : {
      "Camera" : {},
      "Barcode" : {},
      "Push" : {}
    },
    /* 应用发布信息 */
    "distribute" : {
      /* android打包配置 */
      "android" : {
        "permissions" : [
          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
          "<uses-feature android:name=\"android.hardware.camera\"/>",
          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
        ]
      },
      /* ios打包配置 */
      "ios" : {
        "dSYMs" : false
      },
      /* SDK配置 */
      "sdkConfigs" : {
        "push" : {
          "unipush" : {
            "icons" : {
                "android" : {
                    "hdpi" : "unpackage/res/icons/72x72.png",
                    "xhdpi" : "unpackage/res/icons/96x96.png",
                    "xxhdpi" : "unpackage/res/icons/144x144.png",
                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                },
                "ios" : {
                    "appstore" : "unpackage/res/icons/1024x1024.png",
                    "ipad" : {
                        "app" : "unpackage/res/icons/76x76.png",
                        "app@2x" : "unpackage/res/icons/152x152.png",
                        "notification" : "unpackage/res/icons/20x20.png",
                        "notification@2x" : "unpackage/res/icons/40x40.png",
                        "proapp@2x" : "unpackage/res/icons/167x167.png",
                        "settings" : "unpackage/res/icons/29x29.png",
                        "settings@2x" : "unpackage/res/icons/58x58.png",
                        "spotlight" : "unpackage/res/icons/40x40.png",
                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                    },
                    "iphone" : {
                        "app@2x" : "unpackage/res/icons/120x120.png",
                        "app@3x" : "unpackage/res/icons/180x180.png",
                        "notification@2x" : "unpackage/res/icons/40x40.png",
                        "notification@3x" : "unpackage/res/icons/60x60.png",
                        "settings@2x" : "unpackage/res/icons/58x58.png",
                        "settings@3x" : "unpackage/res/icons/87x87.png",
                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                    }
                }
              "small" : {
                "ldpi" : "D:/xindao/wenjian/img/logo/app.png"
              }
            }
          }
        }
    },
    /* 快应用特有相关 */
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
        "appid" : "",
        "setting" : {
            "urlCheck" : false
      },
      "icons" : {
        "android" : {
          "hdpi" : "unpackage/res/icons/72x72.png",
          "xhdpi" : "unpackage/res/icons/96x96.png",
          "xxhdpi" : "unpackage/res/icons/144x144.png",
          "xxxhdpi" : "unpackage/res/icons/192x192.png"
        },
        "usingComponents" : true
        "ios" : {
          "appstore" : "unpackage/res/icons/1024x1024.png",
          "ipad" : {
            "app" : "unpackage/res/icons/76x76.png",
            "app@2x" : "unpackage/res/icons/152x152.png",
            "notification" : "unpackage/res/icons/20x20.png",
            "notification@2x" : "unpackage/res/icons/40x40.png",
            "proapp@2x" : "unpackage/res/icons/167x167.png",
            "settings" : "unpackage/res/icons/29x29.png",
            "settings@2x" : "unpackage/res/icons/58x58.png",
            "spotlight" : "unpackage/res/icons/40x40.png",
            "spotlight@2x" : "unpackage/res/icons/80x80.png"
          },
          "iphone" : {
            "app@2x" : "unpackage/res/icons/120x120.png",
            "app@3x" : "unpackage/res/icons/180x180.png",
            "notification@2x" : "unpackage/res/icons/40x40.png",
            "notification@3x" : "unpackage/res/icons/60x60.png",
            "settings@2x" : "unpackage/res/icons/58x58.png",
            "settings@3x" : "unpackage/res/icons/87x87.png",
            "spotlight@2x" : "unpackage/res/icons/80x80.png",
            "spotlight@3x" : "unpackage/res/icons/120x120.png"
          }
        }
      }
    }
  },
  /* 快应用特有相关 */
  "quickapp" : {},
  /* 小程序特有相关 */
  "mp-weixin" : {
    "appid" : "",
    "setting" : {
      "urlCheck" : false
    },
    "mp-alipay" : {
        "usingComponents" : true
    },
    "mp-baidu" : {
        "usingComponents" : true
    },
    "mp-toutiao" : {
        "usingComponents" : true
    },
    "uniStatistics" : {
        "enable" : false
    },
    "vueVersion" : "3"
    "usingComponents" : true
  },
  "mp-alipay" : {
    "usingComponents" : true
  },
  "mp-baidu" : {
    "usingComponents" : true
  },
  "mp-toutiao" : {
    "usingComponents" : true
  },
  "uniStatistics" : {
    "enable" : false
  },
  "vueVersion" : "3"
}
src/pages/components/GoodsDetailPopup.vue
@@ -43,16 +43,9 @@
                                placeholder=""
                            />
                        </up-form-item>
                        <up-form-item label="单价(元)/件" prop="taxInclusiveUnitPrice">
                        <up-form-item label="单价(美元)/件" prop="taxInclusiveUnitPrice">
                            <up-input 
                                v-model="detailData.taxInclusiveUnitPrice" 
                                disabled
                                placeholder=""
                            />
                        </up-form-item>
                        <up-form-item label="单价(美元)/件" prop="dollarPrice">
                            <up-input
                                v-model="detailData.dollarPrice"
                                disabled 
                                placeholder=""
                            />
@@ -83,7 +76,7 @@
                                placeholder=""
                            />
                        </up-form-item> -->
                        <up-form-item label="每件数量/支" prop="boxNum" required>
                        <up-form-item label="每件数量/支" prop="boxNum">
                             <up-input 
                                v-model="detailData.boxNum" 
                                disabled 
src/pages/index.vue
@@ -16,21 +16,6 @@
                <view class="hero-wave"></view>
            </view>
        </view>
        <!--        <view class="notice-section">-->
        <!--            <view class="notice">-->
        <!--                <view class="notice-content">-->
        <!--                    <view class="notice-left">-->
        <!--                        <text class="notice-status">通知</text>-->
        <!--                    </view>-->
        <!--                    <view class="notice-separator"></view>-->
        <!--                    <view class="notice-right">-->
        <!--                        <text class="notice-label">{{currentStatus}}</text>-->
        <!--                        <text class="notice-text">当日销售设备数:<text class="notice-number">{{number}}<text class="notice-unit">个</text></text></text>-->
        <!--                    </view>-->
        <!--                </view>-->
        <!--            </view>-->
        <!--        </view>-->
        <!-- 仓储物流模块 -->
        <view class="common-module marketing-module">
            <view class="module-header">
@@ -45,155 +30,6 @@
                >
                    <up-grid-item
                        v-for="(item, index) in warehousingLogisticsItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
        <!-- 营销管理模块 -->
        <view class="common-module marketing-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">营销管理</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in marketingItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
        <!-- 采购管理模块 -->
        <view class="common-module purchase-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">采购管理</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in purchaseItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
        <!-- 协同办公模块 -->
        <view class="common-module collaboration-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">协同办公</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in collaborationItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
        <!-- 生产管控模块 -->
        <view class="common-module production-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">生产管控</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in productionItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
        <!-- 设备管理模块 -->
        <view class="common-module equipment-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">设备管理</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in equipmentItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
@@ -629,11 +465,12 @@
        onlyFromCamera:true,
        scanType:['barCode','qrCode'],
        success(res) {
            console.log(res)
            searchDetail(res.result||'')
        },
        fail(res) {
            uni.showToast({
                title: res.errMsg||'扫码失败',
                title: '取消扫码',
                icon: 'none',
                duration: 1500
            })