update

web-vue-admin/src/router/index.ts

@@ -31,14 +31,6 @@ const routes: Array<RouteRecordRaw> = [
         component:  ()=>import('@/views/pay-bind/index.vue')
       },
       {
-        path: '/home/payconfig',
-        name: '支付配置',
-        meta:{
-          icon:'icon-fencengpeizhi'
-        },
-        component:  ()=>import('@/views/pay-config/index.vue')
-      },
-      {
         path: '/home/goodscabinet',
         name: '商品橱柜',
         meta:{
@@ -54,6 +46,14 @@ const routes: Array<RouteRecordRaw> = [
         },
         component:  ()=>import('@/views/pay-list/index.vue')
       },
+      {
+        path: '/home/payconfig',
+        name: '支付配置',
+        meta:{
+          icon:'icon-fencengpeizhi'
+        },
+        component:  ()=>import('@/views/pay-config/index.vue')
+      },
     ]
   },
   {
@@ -66,12 +66,12 @@ const router = createRouter({
   history: createWebHistory(),
   routes
 })
-router.beforeEach((to,from,next)=>{
-  const token:any = getToken
-  if(token){
-    next()
-  }else{
-    router.push('/login')
-  }
-})
+// router.beforeEach((to,from,next)=>{
+//   const token:any = getToken
+//   if(token){
+//     next()
+//   }else{
+//     router.push('/login')
+//   }
+// })
 export default router

web-vue-admin/src/views/pay-bind/index.vue

@@ -301,8 +301,8 @@ const onSetShowTable = async (data: any) => {
   if(query.value.paytype == 1){
   const { mchid, mchkey, appid, name } = data
     const uid: any = getUid()
-    modelRef.mchid = mchid
-    modelRef.mchkey = mchkey
+    modelRef.privatekey = mchid
+    modelRef.alipaypublickey = mchkey
     modelRef.appid = appid
     modelRef.name = name
     // modelRef.server_url =server_url  

web-vue-admin/src/views/pay-list/index.vue

@@ -97,9 +97,9 @@
                         </div>
                     </a-checkbox-group>
                 </a-form-item> -->
-                <a-form-item label="支付前填写手机号" name="price" :label-col="{ span: 2 }" labelAlign="left">
+                <a-form-item label="支付前填写手机号" name="price" :label-col="{ span: 3 }" labelAlign="left">
                     <div style="display: flex;">
-                        <a-switch v-model:checked="formState.fullphone" />
+                        <a-switch :checked="formState.fullphone === '0'" />
                     </div>
                 </a-form-item>
                 <a-form-item label="开始时间" name="price" :label-col="{ span: 2 }" labelAlign="left">
@@ -147,6 +147,7 @@ const disabledDate = (current: any) => {
 const popupScroll = () => {
     console.log('popupScroll');
 };
+const uid =getUid()
 const value = ref<string>('');
 const checkboxValue = ref<any>([])
 const optionss = ref<Array<Object>>([])
@@ -271,7 +272,7 @@ const onCopy = async(e:any) => {
     // ?ditch=1&goodsid=1&phone=1&studentid=1
     const value = localStorage.getItem('url') || ''
      try {
-        await toClipboard(`${value}?ditch=${e.goodspayditch[0].appointpay}&goodsid=${e.goodspayditch[0].goodsid}&phone=${e.fullphone}`)
+        await toClipboard(`${value}?ditch=${uid}&goodsid=${e.goodsid}&phone=${e.fullphone}`)
         message.success('复制成功')
       } catch (e) {
         console.error(e)
@@ -339,6 +340,7 @@ defineExpose({
     value3,
     value4,
     value5,
+    uid,
     onSet,
     onSearch,
     columns,