From 1a47dc1b54cfeb0ce5f4d97f56da694ab222ddd3 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 5 Dec 2023 22:37:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E5=AE=9D=E9=97=AE=E9=A2=98=202=E3=80=81=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/right-bar/right-bar.vue            |   2 +-
 components/top-bar/top-bar.vue                |  13 +-
 pages.json                                    |   8 +
 pages/contract/index.vue                      |  13 +-
 pages/index/self-support/companyQuote.vue     |  13 +-
 pages/index/shop/detail.vue                   |  17 +-
 pages/index/shop/pay.vue                      | 180 ++++++++++++++++++
 pages/index/shop/shop.vue                     |  29 +--
 pages/user/components/added.vue               |   5 +-
 pages/yellowPage/info.vue                     |  53 +++---
 pages/yellowPage/list.vue                     |   2 +-
 static/images/no-logo.jpg                     | Bin 0 -> 3305 bytes
 .../service/client/contract/kh/addSign.js     |   9 +-
 .../router/service/client/order/kh/add.js     |  50 +++++
 .../service/client/order/kh/addFromList.js    |  63 ++++++
 .../router/service/client/order/kh/getInfo.js |  37 ++++
 .../router/service/client/order/kh/test.js    |  23 ---
 .../service/client/order/kh/updateAddress.js  |  32 ++++
 .../service/client/user/pub/getCompany.js     |   5 +-
 19 files changed, 470 insertions(+), 84 deletions(-)
 create mode 100644 pages/index/shop/pay.vue
 create mode 100644 static/images/no-logo.jpg
 create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
 create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
 create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
 delete mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/test.js
 create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js

diff --git a/components/right-bar/right-bar.vue b/components/right-bar/right-bar.vue
index 70b7606..8f3036e 100644
--- a/components/right-bar/right-bar.vue
+++ b/components/right-bar/right-bar.vue
@@ -48,7 +48,7 @@
                             </a>
                         </li>
                         <li class="side-steel-search">
-                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/yellowPage/list')">
+                            <a rel="nofollow" href="javascript:;" @click="navTo('/pages/contract/index?tab=sign')">
                                 <div class="item">
                                     <agreement theme="outline" size="16" fill="#666" strokeLinecap="square"/>
                                 </div>
diff --git a/components/top-bar/top-bar.vue b/components/top-bar/top-bar.vue
index 0708380..fd10c19 100644
--- a/components/top-bar/top-bar.vue
+++ b/components/top-bar/top-bar.vue
@@ -28,15 +28,16 @@
 								<el-dropdown-item>
                                     <navigator url="/pages/user/school">金久信学堂</navigator>
                                 </el-dropdown-item>
-								<el-dropdown-item command="contract">合同管理</el-dropdown-item>
+								<el-dropdown-item>
+                                    <navigator url="/pages/contract/index">合同管理</navigator>
+                                </el-dropdown-item>
+                                <el-dropdown-item>
+                                    <navigator url="/pages/contract/index?tab=sign">签约宝</navigator>
+                                </el-dropdown-item>
 								<el-dropdown-item>订单管理</el-dropdown-item>
 								<el-dropdown-item command="logout">退出登录</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
-
-
-
-
 					</div>
 				</div>
 				<div class="mod-tools">
@@ -106,8 +107,6 @@
 			handleCommand(e) {
 				if (e == 'logout') {
 					this.logout()
-				}else if(e == 'contract') {
-					vk.navigateTo('/pages/contract/index');
 				}
 			},
 			logout() {
diff --git a/pages.json b/pages.json
index 86bf64b..09d6e25 100644
--- a/pages.json
+++ b/pages.json
@@ -280,6 +280,14 @@
                 "navigationBarTitleText" : "金久信学堂",
                 "enablePullDownRefresh" : false
             }
+        },
+        {
+            "path" : "pages/index/shop/pay",
+            "style" :
+            {
+                "navigationBarTitleText" : "订单支付",
+                "enablePullDownRefresh" : false
+            }
         }
     ],
 	"globalStyle": {
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index 062e036..5c21d99 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -372,8 +372,17 @@ export default {
             // 表单相关结束-----------------------------------------------------------
         }
     },
-    onLoad() {
-        this.query(1)
+    onLoad(options) {
+        if (options.tab) {
+            if (options.tab === 'sign') {
+                this.isSign = true
+            } else {
+                this.menuIndex = String(options.tab)
+                this.formData.status = Number(options.tab)
+                this.isSign = false
+                this.query(1)
+            }
+        }
     },
     methods: {
         menuSelect(e) {
diff --git a/pages/index/self-support/companyQuote.vue b/pages/index/self-support/companyQuote.vue
index 5a455c7..6b02b6b 100644
--- a/pages/index/self-support/companyQuote.vue
+++ b/pages/index/self-support/companyQuote.vue
@@ -90,7 +90,7 @@
                     <view class="ml-35">客服联系方式: 0771-3923001</view>
                 </view>
                 <view class="mt-40 flex justify-center items-center">
-                    <el-button type="primary"
+                    <el-button type="primary" @click="newOrder"
                                :disabled="contentList.length === 0 || companyList.length === 0 || !companyList[0].name">
                         立即支付
                     </el-button>
@@ -172,6 +172,17 @@ export default {
         },
         removeCompany() {
             this.companyList.splice(index, 1)
+        },
+        async newOrder(){
+            const {data} =  await vk.callFunction({
+                url: 'client/order/kh/addFromList',
+                data: {
+                    type: 1,
+                    list: [
+
+                    ]
+                }
+            })
         }
     },
     onLoad() {
diff --git a/pages/index/shop/detail.vue b/pages/index/shop/detail.vue
index 29a3bd3..5e7cccb 100644
--- a/pages/index/shop/detail.vue
+++ b/pages/index/shop/detail.vue
@@ -32,7 +32,7 @@
                         </view>
                         <view class="flex justify-end is-center">
                             <el-button type="danger" round class="add-to-cart-btn" @click.native="addToCart">加入购物车</el-button>
-                            <el-button type="primary" round class="ml-35">立即购买</el-button>
+                            <el-button type="primary" round class="ml-35" @click.native="newOrder">立即购买</el-button>
                         </view>
                     </view>
                 </view>
@@ -45,6 +45,8 @@
         <!-- 现货市场 end -->
         <gap height="50"/>
         <common-footer></common-footer>
+        <right-bar></right-bar>
+
     </view>
 </template>
 
@@ -90,6 +92,19 @@ export default {
                     })
                 }
             })
+        },
+        async newOrder(){
+            const {data} = await vk.callFunction({
+                url: 'client/order/kh/add',
+                data: {
+                    goodsId: this.id,
+                    num: 1,
+                    type: 0
+                }
+            })
+            vk.navigateTo({
+                url: `/pages/index/shop/pay?id=${data}`
+            })
         }
     }
 }
diff --git a/pages/index/shop/pay.vue b/pages/index/shop/pay.vue
new file mode 100644
index 0000000..432f264
--- /dev/null
+++ b/pages/index/shop/pay.vue
@@ -0,0 +1,180 @@
+<template>
+    <view>
+        <top-bar></top-bar>
+        <common-header></common-header>
+        <category-bar></category-bar>
+        <view class="w-1200 m-a bg-white p-40">
+            <template v-if="info">
+                <view class="pb-20 border-bottom flex justify-between items-center">
+                    <text>订单号: {{ info.orderNo }}</text>
+                    <text>下单时间: {{ info._add_time_str }}</text>
+                </view>
+                <view class="my-20">
+                    <text class="font-bold text-35">商品详情</text>
+                    <view class="flex justify-start items-start my-20">
+                        <text class="w-15p">封面</text>
+                        <text class="w-40p">名称</text>
+                        <text class="w-15p">数量</text>
+                        <text class="w-15p">单价</text>
+                        <text class="w-15p">小计</text>
+                    </view>
+                    <view class="flex justify-start items-start my-20" v-for="(item, index) in info.goods">
+                        <text class="w-15p">
+                            <image :src="item.goodsCover" mode="aspectFit" class="goods-cover"/>
+                        </text>
+                        <text class="w-40p font-bold text-35">{{ item.goodsName }}</text>
+                        <text class="w-15p">x{{ item.num }}</text>
+                        <text class="w-15p text-main">￥{{ item.goodsPrice }}</text>
+                        <text class="w-15p">{{ item.goodsPrice * item.num }}</text>
+                    </view>
+                </view>
+            </template>
+            <el-row :gutter="10" class="mb-20">
+                <el-col :span="4">
+                    <el-input v-model="name" placeholder="请输入收件人姓名"/>
+                </el-col>
+                <el-col :span="4">
+                    <el-input v-model="phone" placeholder="请输入收件人手机号"/>
+                </el-col>
+            </el-row>
+            <el-row :gutter="10" class="border-bottom pb-20">
+                <el-col :span="4">
+                    <el-select v-model="addressIndex[0]" placeholder="请选择省">
+                        <el-option v-for="(item, index) in provinceData" :key="index"
+                                   :label="item.name"
+                                   :value="index">
+                        </el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-select v-model="addressIndex[1]" placeholder="请选择市" :disabled="addressIndex.length === 0">
+                        <template v-if="addressIndex[0] !== null">
+                            <el-option v-for="(item, index) in cityData[addressIndex[0]]" :key="index"
+                                       :label="item.name"
+                                       :value="index">
+                            </el-option>
+                        </template>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-select v-model="addressIndex[2]" placeholder="请选择区" :disabled="addressIndex.length === 1">
+                        <template v-if="addressIndex[0] !== null && addressIndex[1] !== null">
+                            <el-option v-for="(item, index) in areaData[addressIndex[0]][addressIndex[1]]" :key="index"
+                                       :label="item.name"
+                                       :value="index">
+                            </el-option>
+                        </template>
+                    </el-select>
+                </el-col>
+                <el-col :span="12">
+                    <el-input v-model="addressDetail" placeholder="请输入详细地址"/>
+                </el-col>
+            </el-row>
+            <view class="mt-20 w-50p flex flex-col justify-center items-center m-a">
+                <text class="text-main font-bold text-40 mb-20">订单金额:￥{{ info.amount }}</text>
+                <el-button type="primary" round :disabled="!phone || !name || addressIndex.length < 3" @click="onPay">立即支付</el-button>
+            </view>
+            <div class="pay-price" v-if="billQRCode">
+                <uv-qrcode ref="qrcode" size="240px" :value="billQRCode"></uv-qrcode>
+                <div class="pay-desc">请打开手机微信，扫一扫完成支付</div>
+                <el-button type="success" @click="onPayStatus">已完成支付</el-button>
+            </div>
+        </view>
+        <gap height="50"/>
+        <common-footer></common-footer>
+        <right-bar></right-bar>
+    </view>
+</template>
+
+<script>
+import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
+import dayjs from "dayjs";
+const OpenSdk = require('../../user/lib/base').default;
+
+const sdk = new OpenSdk({
+    appId: '10037e6f6823b20801682b6a5e5a0006',
+    appKey: '1c4e3b16066244ae9b236a09e5b312e8'
+})
+
+export default {
+    name: "order",
+    data() {
+        return {
+            id: null,
+            info: null,
+            provinceData: provinces,
+            cityData: citys,
+            areaData: areas,
+            addressIndex: [null, null, null],
+            addressDetail: '',
+            name: '',
+            phone: '',
+            billQRCode: null
+        }
+    },
+    methods: {
+        async getInfo() {
+            this.info = await vk.callFunction({
+                url: 'client/order/kh/getInfo',
+                data: {
+                    id: this.id
+                }
+            })
+        },
+        onPay() {
+            const requestTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')
+            const timestamp = dayjs().format('YYYYmmddHHmmSS')
+            console.log(timestamp)
+            console.log(requestTimestamp)
+            let data = {
+                queryUrl: 'https://test-api-open.chinaums.com/v1/netpay/bills/get-qrcode',
+                timestamp,
+                nonce: 'rp84ufhfn20yneo3tp',
+                content: {
+                    requestTimestamp,
+                    mid: '898201612345678',
+                    tid: '88880001',
+                    instMid: 'QRPAYDEFAULT',
+                    totalAmount: 1,
+                    notifyUrl: 'https://static-mp-0737e52b-fffa-4223-bcdf-d4ad3d9968a5.next.bspapp.com/#/'
+                }
+            }
+            /**
+             * 调用函数
+             */
+            sdk.exec(data).then(res => {
+                const h = this.$createElement;
+                const result = JSON.parse(res);
+                if (result.errCode === 'SUCCESS') {
+                    this.showQrcode = true
+                    this.billQRCode = result.billQRCode
+                }
+            })
+        },
+    },
+    onLoad(options) {
+        if (options && options.id) {
+            this.id = options.id
+            this.getInfo()
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.goods-cover {
+    width: 100px;
+    height: 100px;
+}
+
+
+.pay-price {
+    margin-top: 20px;
+}
+
+.pay-desc {
+    font-size: 16px;
+    line-height: 2em;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/shop/shop.vue b/pages/index/shop/shop.vue
index b8ebc69..ba5d05b 100644
--- a/pages/index/shop/shop.vue
+++ b/pages/index/shop/shop.vue
@@ -22,20 +22,22 @@
         </view>
 
         <view class="goods-list">
-            <el-row class="wrap" type="flex" :gutter="10" justify="space-between">
-                <el-col :span="4" v-for="(item, index) in goodsList" :key="index">
-                    <div class="grid-content bg-purple pointer"
-                         @click="navTo(`/pages/index/shop/detail?id=${item._id}`)">
-                        <image :src="item.cover" mode="aspectFill"/>
-                        <view class="comments">
-                            <view class="goods-name">
-                                {{ item.name }}
+            <view class="flex flex-wrap justify-start is-status">
+                <view class="w-20p" v-for="(item, index) in goodsList" :key="index">
+                    <view class="p-20">
+                        <view class="grid-content bg-purple pointer"
+                              @click="navTo(`/pages/index/shop/detail?id=${item._id}`)">
+                            <image :src="item.cover" mode="aspectFill"/>
+                            <view class="comments">
+                                <view class="goods-name">
+                                    {{ item.name }}
+                                </view>
+                                <view class="goods-price">￥{{ item.amount }}</view>
                             </view>
-                            <view class="goods-price">￥{{ item.amount }}</view>
                         </view>
-                    </div>
-                </el-col>
-            </el-row>
+                    </view>
+                </view>
+            </view>
             <div class="pagination">
                 <el-pagination
                     background
@@ -167,6 +169,7 @@ export default {
     .grid-content {
         display: flex;
         justify-content: center;
+        align-items: center;
         background-color: #fff;
         width: 100%;
         padding: 10px;
@@ -177,7 +180,9 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: start;
+            align-items: flex-start;
             line-height: 2em;
+            width: 100%;
 
             .goods-name {
                 font-size: 16px;
diff --git a/pages/user/components/added.vue b/pages/user/components/added.vue
index d01a21f..5f20d34 100644
--- a/pages/user/components/added.vue
+++ b/pages/user/components/added.vue
@@ -53,6 +53,7 @@
 
 <script>
 import UQRCode from 'uqrcodejs';
+import dayjs from "dayjs";
 const OpenSdk = require('../lib/base').default;
 // const OpenSdk = require('ums-sdk-nodejs').default;
 
@@ -180,8 +181,8 @@ export default {
     },
     onPay() {
       const date = new Date()
-      const requestTimestamp = this.dateFormat('YYYY-mm-dd HH:MM:SS', date)
-      const timestamp = this.dateFormat('YYYYmmddHHMMSS', date)
+      const requestTimestamp = dayjs(date).format('YYYY-MM-DD HH:MM:ss')
+      const timestamp = dayjs(date).format('YYYYmmddHHmmSS')
       console.log(timestamp)
       console.log(requestTimestamp)
       let data = {
diff --git a/pages/yellowPage/info.vue b/pages/yellowPage/info.vue
index b8079ec..dee35fe 100644
--- a/pages/yellowPage/info.vue
+++ b/pages/yellowPage/info.vue
@@ -17,10 +17,12 @@
             <view class="mt-40 bg-white company">
                 <view class="p-50 flex justify-between items-center pb-30 border-bottom">
                     <view class="flex justify-start items-center">
-                        <image class="logo" :src="info.businessCard.logo"/>
+                        <image class="logo" :src="info.businessCard.logo" v-if="info.businessCard"/>
                         <view class="ml-35 flex flex-col justify-start items-start">
                             <text class="text-40 font-bold">{{ info.company.companyName }}</text>
-                            <text class="text-gray text-28 mt-40">主营业务: {{ info.businessCard.mainBusiness }}</text>
+                            <text class="text-gray text-28 mt-40" v-if="info.businessCard">主营业务:
+                                {{ info.businessCard.mainBusiness }}
+                            </text>
                         </view>
                     </view>
                     <view class="flex justify-end items-center">
@@ -50,23 +52,23 @@
                         <view class="mt-20 flex justify-start items-start flex-wrap w-100p text-30">
                             <view class="flex justify-start items-center w-33p mb-20">
                                 <i class="el-icon-map-location mr-15"/>
-                                <text>地址:{{ info.manager.address }}</text>
+                                <text v-if="info.manager">地址:{{ info.manager.address }}</text>
                             </view>
                             <view class="flex justify-start items-center w-33p mb-20">
                                 <i class="el-icon-phone mr-15"/>
-                                <text>电话:{{ info.businessCard.phone }}</text>
+                                <text v-if="info.businessCard">电话:{{ info.businessCard.phone }}</text>
                             </view>
                             <view class="flex justify-start items-center w-33p mb-20">
                                 <i class="el-icon-mobile mr-15"/>
-                                <text>手机:{{ info.businessCard.mobile }}</text>
+                                <text v-if="info.businessCard">手机:{{ info.businessCard.mobile }}</text>
                             </view>
                             <view class="flex justify-start items-center w-33p">
                                 <i class="el-icon-message mr-15"/>
-                                <text>邮箱:{{ info.businessCard.email }}</text>
+                                <text v-if="info.businessCard">邮箱:{{ info.businessCard.email }}</text>
                             </view>
                             <view class="flex justify-start items-center w-33p">
                                 <i class="el-icon-data-board mr-15"/>
-                                <text>网址:{{ info.businessCard.website }}</text>
+                                <text v-if="info.businessCard">网址:{{ info.businessCard.website }}</text>
                             </view>
                         </view>
                     </view>
@@ -98,7 +100,8 @@
                     </view>
                     <view class="flex justify-between items-start mb-20">
                         <view class="title">发布的询价单</view>
-                        <view class="text-main pointer" @click="vk.navigateTo('/pages/spot/goods/goods')">查看更多></view>
+                        <view class="text-main pointer" @click="vk.navigateTo('/pages/spot/goods/goods')">查看更多>
+                        </view>
                     </view>
                     <view class="bg-gray-light flex justify-center items-center table-header p-20">
                         <view class="text-gray flex-1">品名/材质</view>
@@ -111,20 +114,22 @@
                     </view>
                     <view class="flex justify-center items-center mt-20 w-100p p-20"
                           v-for="(item, index) in info.enquiryList" :key="index">
-                        <view class="text-main flex-1">{{ item.productList[0].goodsName }}</view>
-                        <view class="flex-1">{{ item.productList[0].procureNumber }}{{
-                                item.productList[0].procureUnit
-                            }}
-                        </view>
-                        <view class="flex-1">{{ item.address }}</view>
-                        <view class="flex-1">{{ info.company.companyName }}</view>
-                        <view class="flex-1">{{ item.answerNumber }}家已报价</view>
-                        <view class="flex-1">{{ item._add_time_str }}</view>
-                        <view class="flex-1">
-                            <el-button type="primary" plain class="empty-bg-plain-btn"
-                                       @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">查看
-                            </el-button>
-                        </view>
+                        <template v-if="item.productList && item.productList.length > 0 && JSON.stringify(item.productList[0]) !== '{}'">
+                            <view class="text-main flex-1">{{ item.productList[0].goodsName }}</view>
+                            <view class="flex-1">{{ item.productList[0].procureNumber }}{{
+                                    item.productList[0].procureUnit
+                                }}
+                            </view>
+                            <view class="flex-1">{{ item.address }}</view>
+                            <view class="flex-1">{{ info.company.companyName }}</view>
+                            <view class="flex-1">{{ item.answerNumber }}家已报价</view>
+                            <view class="flex-1">{{ item._add_time_str }}</view>
+                            <view class="flex-1">
+                                <el-button type="primary" plain class="empty-bg-plain-btn"
+                                           @click.native="vk.navigateTo('/pages/enquiry/detail?id=' + item._id);">查看
+                                </el-button>
+                            </view>
+                        </template>
                     </view>
                     <view class="flex justify-between items-start mb-20">
                         <view class="title">发布的加工单</view>
@@ -142,10 +147,6 @@
                     <view class="flex justify-center items-center mt-20 w-100p p-20"
                           v-for="(item, index) in info.processList" :key="index">
                         <view class="text-main flex-1">{{ item.title }}</view>
-                        <view class="flex-1">{{ item.productList[0].procureNumber }}{{
-                                item.productList[0].procureUnit
-                            }}
-                        </view>
                         <!--                        <view class="flex-1">{{ item.address  }}</view>-->
                         <view class="flex-1">{{ item.num }}</view>
                         <view class="flex-1">{{ info.company.companyName }}</view>
diff --git a/pages/yellowPage/list.vue b/pages/yellowPage/list.vue
index 861857f..b3bfae6 100644
--- a/pages/yellowPage/list.vue
+++ b/pages/yellowPage/list.vue
@@ -91,7 +91,7 @@
                         </view>
                         <view class="flex justify-start items-center">
                             <image :src="item.businessCard.logo" class="logo" v-if="item.businessCard" mode="aspectFill"/>
-                            <view class="logo" v-else/>
+                            <image v-else src="/static/images/no-logo.jpg" class="logo" mode="aspectFill"/>
                             <view class="ml-35 flex flex-col justify-start items-start">
                                 <text>{{ item.name }}</text>
                                 <i class="el-icon-star-off text-main my-20"/>
diff --git a/static/images/no-logo.jpg b/static/images/no-logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d921a819515751402da3c4c5936bf0ac7d99d8a1
GIT binary patch
literal 3305
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
UjgYFk@$+G8<!E`^{8Z$>0hDl>e*gdg

literal 0
HcmV?d00001

diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
index cc2fdbb..a50927f 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js
@@ -16,16 +16,12 @@ module.exports = {
         const otherUser = await vk.baseDao.findByWhereJson({
             dbName: 'uni-id-users',
             whereJson: {
-                mobile: "1"
+                mobile: data.phone
             }
         })
         if (JSON.stringify(otherUser) === '{}') return {
             code: -1,
-            msg: '该用户不存在',
-            data: {
-                otherUser,
-                phone: data.phone
-            }
+            msg: '该用户不存在'
         }
 
         data.transactionId = vk.pubfn.createOrderNo("C", 20)
@@ -48,6 +44,7 @@ module.exports = {
                         docTitle: data.title,
                         type: 'sign',
                         contractBase: data.contractFile,
+                        partyCount: 2
                     }
                 }
             })
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
new file mode 100644
index 0000000..bd456ca
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/add.js
@@ -0,0 +1,50 @@
+'use strict';
+module.exports = {
+    /**
+     * XXXnameXXX
+     * @url client/order/kh/add 前端调用的url参数地址
+     * data 请求参数
+     * @param {String} params1  参数1
+     */
+    main: async (event) => {
+        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+        let {uid} = data;
+        let res = {code: 0, msg: ""};
+        // 业务逻辑开始-----------------------------------------------------------
+
+        const goods = await vk.baseDao.findById({
+            dbName: "jjx-goods",
+            id: data.goodsId
+        })
+
+        // type 0: 商品
+        // type 1: 自营
+        const orderId = await vk.baseDao.add({
+            dbName: "jjx-order",
+            dataJson: {
+                orderNo: vk.pubfn.createOrderNo("O", 20),
+                uid,
+                orderStatus: 0,
+                type: data.type,
+                amount: goods.amount * data.num,
+            }
+        })
+
+        await vk.baseDao.add({
+            dbName: "jjx-order-goods",
+            dataJson: {
+                orderId: orderId,
+                goodsId: data.goodsId,
+                num: data.num,
+                goodsName: goods.name,
+                goodsPrice: goods.amount,
+                goodsCover: goods.cover,
+            }
+        })
+
+        res.data = orderId
+        // 业务逻辑结束-----------------------------------------------------------
+        return res;
+    }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
new file mode 100644
index 0000000..f825980
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/addFromList.js
@@ -0,0 +1,63 @@
+'use strict';
+module.exports = {
+    /**
+     * XXXnameXXX
+     * @url client/order/kh/addFromList 前端调用的url参数地址
+     * data 请求参数
+     * @param {String} params1  参数1
+     */
+    main: async (event) => {
+        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+        let {uid} = data;
+        let res = {code: 0, msg: ""};
+        // 业务逻辑开始-----------------------------------------------------------
+
+        let amount = 0
+        for (const item of data.list) {
+            const goods = await vk.baseDao.findById({
+                dbName: "jjx-goods",
+                id: item.goodsId
+            })
+            amount += item.num * goods.amount
+        }
+
+        const orderId = await vk.baseDao.adds({
+            dbName: "jjx-order",
+            dataJson: {
+                orderNo: vk.pubfn.createOrderNo("O", 20),
+                orderStatus: 0,
+                type: data.type,
+                uid,
+                amount
+            }
+        })
+
+        const list = []
+        for (const item of data.list) {
+            const goods = await vk.baseDao.findById({
+                dbName: "jjx-goods",
+                id: item.goodsId
+            })
+
+            list.push({
+                orderId: orderId,
+                goodsId: item.goodsId,
+                num: item.num,
+                goodsName: goods.name,
+                goodsPrice: goods.amount,
+                goodsCover: goods.cover
+            })
+        }
+
+        await vk.baseDao.adds({
+            dbName: "jjx-order-goods",
+            dataJson: list
+        })
+
+        res.data = orderId
+
+        // 业务逻辑结束-----------------------------------------------------------
+        return res;
+    }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
new file mode 100644
index 0000000..601a9bf
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/getInfo.js
@@ -0,0 +1,37 @@
+'use strict';
+module.exports = {
+    /**
+     * XXXnameXXX
+     * @url client/order/kh/getInfo 前端调用的url参数地址
+     * data 请求参数
+     * @param {String} params1  参数1
+     */
+    main: async (event) => {
+        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+        let {uid} = data;
+        let res = {code: 0, msg: ""};
+        // 业务逻辑开始-----------------------------------------------------------
+
+        res = await vk.baseDao.selects({
+            dbName: "jjx-order",
+            getOne: true,
+            getMain: true,
+            whereJson: {
+                _id: data.id
+            },
+            foreignDB: [
+                {
+                    dbName: "jjx-order-goods",
+                    localKey: "_id",
+                    foreignKey: "orderId",
+                    as: "goods",
+                }
+            ]
+        });
+
+
+        // 业务逻辑结束-----------------------------------------------------------
+        return res;
+    }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/test.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/test.js
deleted file mode 100644
index 8e21145..0000000
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-module.exports = {
-	/**
-	 * 此函数名称
-	 * @url client/order/kh/test 前端调用的url参数地址
-	 * data 请求参数
-	 * @params {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, originalParam } = event;
-		let { customUtil, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code : 0, msg : '' };
-		// 业务逻辑开始-----------------------------------------------------------
-		// 可写与数据库的交互逻辑等等
-
-
-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
-}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js
new file mode 100644
index 0000000..93685e3
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/order/kh/updateAddress.js
@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+	/**
+	 * XXXnameXXX
+	 * @url client/order/kh/updateAddress 前端调用的url参数地址
+	 * data 请求参数
+	 * @param {String} params1  参数1
+	 */
+	main: async (event) => {
+		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+		let { uid } = data;
+		let res = { code: 0, msg: "" };
+		// 业务逻辑开始-----------------------------------------------------------
+
+        await vk.baseDao.updateById({
+            dbName: "jjx-order",
+            id: data.id,
+            dataJson: {
+                address: data.address,
+                addressDetail: data.addressDetail,
+                phone: data.phone,
+                name: data.name
+            }
+        });
+
+
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
index d844fc9..0929d20 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
+++ b/uniCloud-aliyun/cloudfunctions/router/service/client/user/pub/getCompany.js
@@ -24,9 +24,10 @@ module.exports = {
             whereJson['businessCard.mainSpotCategoryIds'] = _.in(data.mainSpotCategoryIds);
         }
         // 业务逻辑开始-----------------------------------------------------------
-        res = await vk.baseDao.getTableData({
+        res = await vk.baseDao.select({
             dbName: dbName.user,
-            whereJson
+            whereJson,
+            pageSize: -1
         });
         console.log('whereJson', whereJson)
         // 业务逻辑结束-----------------------------------------------------------